Skip to content

Commit 5259b56

Browse files
west3436west3436
authored
Merge branch 'Bleeding-Edge' into 2025-01-spiderbot-spawner
2 parents 2d3613d + 57657d2 commit 5259b56

File tree

14 files changed

+103
-172
lines changed

14 files changed

+103
-172
lines changed

‎code/game/objects/items/devices/roganbot.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ var/static/list/headshot_zones = list(LIMB_HEAD,TARGET_EYES,TARGET_MOUTH)
393393
say("Eight!")
394394
if(7)
395395
playsound(loc,'sound/effects/2003M/Seven.ogg',100)
396-
say("Sever!")
396+
say("Seven!")
397397
if(6)
398398
playsound(loc,'sound/effects/2003M/Six.ogg',100)
399399
say("Six!")

‎code/game/objects/structures/crates_lockers/closets/utility_closets.dm‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,6 @@
117117
/obj/structure/closet/firecloset/full/atoms_to_spawn()
118118
return ..() + /obj/item/device/flashlight
119119

120-
/obj/structure/closet/firecloset/update_icon()
121-
if(!opened)
122-
icon_state = icon_closed
123-
else
124-
icon_state = icon_opened
125-
126120

127121
/*
128122
* Tool Closet

‎code/modules/clothing/head/misc_special.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
else
9595
return
9696

97-
try_hotspot_expose(700, SMALL_FLAME, -1)
97+
try_hotspot_expose(700, SMALL_FLAME, 0)
9898

9999
/obj/item/clothing/head/cakehat/attack_self(mob/user as mob)
100100
if(status > 1)

‎code/modules/clothing/suits/miscellaneous.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ var/list/tag_suits_list = list()
505505
item_state = "strait_jacket"
506506
origin_tech = Tc_BIOTECH + "=2"
507507
body_parts_covered = ARMS|LEGS|FULL_TORSO|FEET|HANDS|HIDETAIL
508-
species_fit = list(INSECT_SHAPED)
508+
clothing_flags = ONESIZEFITSALL
509509

510510
/obj/item/clothing/suit/ianshirt
511511
name = "worn shirt"

‎code/modules/mob/living/carbon/human/human.dm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@
766766
xylophone=0
767767
return
768768

769-
/mob/living/carbon/human/proc/vomit(hairball = 0, instant = 0)
769+
/mob/living/carbon/human/proc/vomit(hairball = 0, instant = 0, vomitvolume = 0.1)
770770
if(species && species.flags & SPECIES_NO_MOUTH)
771771
return
772772

@@ -810,7 +810,7 @@
810810
if(G.reagents.total_volume <= G.reagents.maximum_volume-7) //Container can fit 7 more units of chemicals - vomit into it
811811
G.reagents.add_reagent(VOMIT, rand(3,10))
812812
if(src.reagents)
813-
reagents.trans_to(G, 1 + reagents.total_volume * 0.1)
813+
reagents.trans_to(G, 1 + reagents.total_volume * vomitvolume) //one tenth
814814
else //Container is nearly full - fill it to the brim with vomit and spawn some more on the floor
815815
G.reagents.add_reagent(VOMIT, 10)
816816
spawn_vomit_on_floor = 1

‎code/modules/mob/living/silicon/emote.dm‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/datum/emote/silicon
2-
mob_type_allowed_typelist = list(/mob/living/silicon)
2+
mob_type_allowed_typelist = list(/mob/living/silicon, /mob/living/carbon/brain, /mob/living/simple_animal/spiderbot)
33
emote_type = EMOTE_AUDIBLE
44
var/module_quirk_required
55
var/pai_software_required
66

77
/datum/emote/sound/silicon
8-
mob_type_allowed_typelist = list(/mob/living/silicon, /mob/living/carbon/brain)
8+
mob_type_allowed_typelist = list(/mob/living/silicon, /mob/living/carbon/brain, /mob/living/simple_animal/spiderbot)
99
emote_type = EMOTE_AUDIBLE
1010
var/module_quirk_required
1111
var/pai_software_required
@@ -16,6 +16,8 @@
1616
return TRUE
1717
if (. && isAI(user) && !module_quirk_required)
1818
return TRUE
19+
if (. && istype(user, /mob/living/simple_animal/spiderbot))
20+
return TRUE
1921
var/mob/living/silicon/pai/the_pai = user
2022
if (. && istype(the_pai) && (!pai_software_required || (pai_software_required in the_pai.software)))
2123
return TRUE
@@ -27,6 +29,12 @@
2729

2830
/datum/emote/silicon/can_run_emote(var/mob/user, var/status_check = TRUE)
2931
. = ..()
32+
if (. && isbrain(user) && !module_quirk_required)
33+
return TRUE
34+
if (. && isAI(user) && !module_quirk_required)
35+
return TRUE
36+
if (. && istype(user, /mob/living/simple_animal/spiderbot))
37+
return TRUE
3038
var/mob/living/silicon/pai/the_pai = user
3139
if (. && istype(the_pai) && (!pai_software_required || (pai_software_required in the_pai.software)))
3240
return TRUE

‎code/modules/projectiles/guns/projectile/roulette.dm‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,20 @@ var/list/restricted_roulette_projectiles = list(
55
/obj/item/projectile/beam/lightning,
66
/obj/item/projectile/beam/procjectile,
77
/obj/item/projectile/beam/lightning/spell,
8-
/obj/item/projectile/rocket,
98
/obj/item/projectile/rocket/nikita,
10-
/obj/item/projectile/rocket/lowyield/extreme,
119
/obj/item/projectile/test,
12-
/obj/item/projectile/friendlyCheck,
1310
/obj/item/projectile/beam/emitter,
1411
/obj/item/projectile/spell_projectile,
1512
/obj/item/projectile/stickybomb,
1613
/obj/item/projectile/beam/lightlaser,
1714
/obj/item/projectile/portalgun,
18-
/obj/item/projectile/soulbullet,
15+
/obj/item/projectile/friendlyCheck,
1916
)
2017

2118
var/list/restrict_with_subtypes = list(
22-
/obj/item/projectile/meteor,
2319
/obj/item/projectile/hookshot,
24-
/obj/item/projectile/immovablerod
20+
/obj/item/projectile/meteor/blob, //includes the nodes
2521
)
26-
2722
/obj/item/weapon/gun/projectile/roulette_revolver
2823
name = "\improper Roulette Revolver"
2924
desc = "A strange-looking revolver. Its construction appears somewhat slapdash."
@@ -69,23 +64,6 @@ var/list/restrict_with_subtypes = list(
6964
else
7065
to_chat(user, "<span class='info'>\The [src] has [shots_left] shots left.</span>")
7166

72-
/obj/item/weapon/gun/projectile/roulette_revolver/attackby(obj/item/A, mob/user)
73-
if(istype(A, /obj/item/weapon/conversion_kit) && restrict_with_subtypes?.len)
74-
var/obj/item/weapon/conversion_kit/CK = A
75-
if(!CK.open)
76-
to_chat(user, "<span class='notice'>\The [CK] needs to be open to use.</span>")
77-
return 1
78-
if(do_after(user, src, 3 SECONDS))
79-
desc += "The barrel and chamber assembly seems to have been modified."
80-
to_chat(user, "<span class='danger'>You finish modifying \the [src]!</span>")
81-
restrict_with_subtypes.Cut()
82-
restricted_roulette_projectiles -= /obj/item/projectile/rocket
83-
restricted_roulette_projectiles -= /obj/item/projectile/rocket/nikita
84-
restricted_roulette_projectiles -= /obj/item/projectile/rocket/lowyield/extreme
85-
return 1
86-
else
87-
..()
88-
8967
/obj/item/weapon/gun/projectile/roulette_revolver/proc/choose_projectile()
9068
if(bullet_type_override)
9169
in_chamber = new bullet_type_override

‎code/modules/reagents/reagents/reagents_medical.dm‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,13 @@
9292
..()
9393
if(volume >= 0.2)
9494
M.rejuvenate()
95+
M.mind?.suiciding = 0
9596

9697
/datum/reagent/panacea/reaction_mob(var/mob/living/M, var/method = TOUCH, var/volume, var/list/zone_sels = ALL_LIMBS)
9798
..()
9899
if((method == INGEST) && (volume >= 0.2))
99100
M.rejuvenate()
101+
M.mind?.suiciding = 0 //If they suicided then bring them back! Also making sure the mind exists in the first place.
100102

101103
/datum/reagent/albuterol
102104
name = "Albuterol"

‎code/modules/virus2/effect/stage_1.dm‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,3 +478,33 @@
478478
animate(color = list(1.375,0.19,0,0,0,1.375,0.19,0,0.19,0,1.375,0,0,0,0,1,0,0,0,0), time = 1)//4
479479
animate(color = list(1.25,0.12,0,0,0,1.25,0.12,0,0.12,0,1.25,0,0,0,0,1,0,0,0,0), time = 1)//3
480480
animate(color = list(1.125,0.06,0,0,0,1.125,0.06,0,0.06,0,1.125,0,0,0,0,1,0,0,0,0), time = 1)//2
481+
482+
/datum/disease2/effect/milkflourvomit
483+
name = "Glutenolactic Emesis Syndrome"
484+
desc = "Causes sudden bouts of intermitent vomiting containing either milk or flour. No effects on lesser lifeforms."
485+
encyclopedia = "Some virologists moonlighting as chefs combine this symptom with Chronic Lime Disease and Chicken Pox for an easy way to make lime cake."
486+
stage = 1
487+
badness = EFFECT_DANGER_ANNOYING
488+
multiplier = 2
489+
max_multiplier = 6
490+
491+
/datum/disease2/effect/milkflourvomit/activate(var/mob/living/mob)
492+
if(!ishuman(mob))
493+
return
494+
495+
var/mob/living/carbon/human/H = mob
496+
switch(rand(1,2))
497+
if(1)
498+
to_chat(mob, "<span class='notice'>You feel an odd taste in your mouth...</span>")
499+
sleep(10)
500+
H.reagents.add_reagent(MILK, multiplier*10)
501+
H.vomit(0,1,1)
502+
if(2)
503+
to_chat(mob, "<span class='notice'>Your throat feels extremely dry!</span>")
504+
H.audible_cough()
505+
H.adjustOxyLoss((2*multiplier)) //not that strong
506+
sleep(10)
507+
H.reagents.add_reagent(FLOUR, multiplier*10)
508+
new /obj/effect/decal/cleanable/flour(get_turf(H))
509+
H.vomit(0,1,1)
510+
//TODO: maybe remove the whole flour vomit thing and have it exclusively as flour coughing if and when we add an easy way to pick up floor flour (the wet dry vacuum doesn't count)

‎config-example/motd.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p><b><font size="32">Welcome to /vg/station</font></b>
2-
<b><font size = "4">The current thread can be found by <font color="purple"><a href="https://boards.4channel.org/vg/catalog#s=ss13g">(clicking here)</a></font></font><br></b>
2+
<b><font size = "4">The current thread can be found by <font color="purple"><a href="https://boards.4chan.org/vm/catalog#s=ss13">(clicking here)</a></font></font><br></b>
33
<font size = "4">Server's byond version is: <a href="https://www.byond.com/docs/notes/515.html">515.1608</a></font>
44
<font size = "4">Read the <a href="http://ss13.moe/wiki/">wiki,</a> and consider <a href="http://ss13.moe/wiki/index.php/Guide_to_Contributing_to_the_Wiki">contributing!</a></font><br>
55
<font color="#DF0101" size=5>Donate to help keep the server running: <a href="http://ss13.moe/donate">Paypal</a> or <a href="http://patreon.com/pomf">Patreon</a>.</font><br>

0 commit comments

Comments
 (0)