cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 05:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix server crash on egg laying (#12318)

Browse Source
This commit is contained in:
Kashargul
2026-01-24 17:34:25 +01:00
committed by GitHub
parent d64306aa5c
commit efb73ab369
15 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_chomp/code/modules/halloween/items.dm
+1 -1
View File
@@ -214,7 +214,7 @@
costumes = typesof(/obj/item/storage/box/halloween/)
/obj/structure/boxpile/attack_hand(mob/living/user)
if(!do_after(user, 5 SECONDS))
if(!do_after(user, 5 SECONDS, src))
return
if(!user.ckey)
return
modular_chomp/code/modules/instruments/stationary.dm
+1 -1
View File
@@ -6,7 +6,7 @@
else
user.visible_message(span_filter_notice("[user] begins securing \the [src] to the floor."), span_filter_notice("You start securing \the [src] to the floor."))
if(do_after(user, 20 * W.toolspeed))
if(do_after(user, 20 * W.toolspeed, src))
if(!src) return
to_chat(user, span_notice("You [anchored? "un" : ""]secured \the [src]!"))
anchored = !anchored
modular_chomp/code/modules/mob/living/carbon/human/species/species_shapeshift_ch.dm
+1 -1
View File
@@ -25,7 +25,7 @@
oocnotes = 1
to_chat(src, span_notify("You begin to reform. You will need to remain still."))
visible_message(span_notify("[src] rapidly contorts and shifts!"), span_danger("You begin to reform."))
if (do_after(src, 4 SECONDS))
if (do_after(src, 4 SECONDS, src))
if (client?.prefs)
client.prefs.vanity_copy_to(src, FALSE, flavour, oocnotes, FALSE)
visible_message(span_notify("[src] adopts a new form!"), span_danger("You have reformed."))
modular_chomp/code/modules/mob/living/simple_mob/subtypes/xenomorph_abilities.dm
+1 -1
View File
@@ -18,7 +18,7 @@
var/obj/O
if(do_after(src, xeno_build_time))
if(do_after(src, xeno_build_time, src))
switch(choice)
if("Resin Door")
O = new /obj/structure/simple_door/resin(targetLoc)
modular_chomp/code/modules/projectiles/guns/zBallisticPort/bullet.dm
+2 -2
View File
@@ -919,7 +919,7 @@
/obj/item/gun/projectile/automatic/serdy/kord/afteratt(atom/A, mob/living/user, adjacent, params)
if(user.size_multiplier <= 0.5) //They're 50% or lower. If they fire this gun, they're gonna get obliterated.
to_chat(user,span_warning("You struggle to reach the trigger. Maybe shooting such a big gun isn't such a good idea..."))
if(do_after(user, 5 SECONDS)) //Give them a chance to take it back.
if(do_after(user, 5 SECONDS, src)) //Give them a chance to take it back.
. = ..() //RIP
/obj/item/gun/projectile/automatic/serdy/kord/handle_post_fire(mob/living/user, atom/target, var/pointblank=0, var/reflex=0)
@@ -1444,7 +1444,7 @@
Fire_userless(user)
burst = burstsetting
return
if(do_after(user, 30)) //SHIT IS STEALTHY EYYYYY
if(do_after(user, 30, src)) //SHIT IS STEALTHY EYYYYY
icon_state = "sawnshotgun"
item_state = "sawnshotgun"