cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-07-20 04:37:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

Browse Source
This commit is contained in:
SandPoot
2023-09-14 22:32:47 -03:00
parent 486e429597 98c0f38de3
commit 0b04af4b76
67 changed files with 219 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+1 -1
View File
@@ -468,7 +468,7 @@
user.visible_message("<span class='warning'>[src] begins to shake violently!</span>", \
"<span class='notice'>You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)</span>", \
"<span class='hear'>You hear banging from [src].</span>")
if(do_after(user,(breakout_time), target = src, required_mobility_flags = MOBILITY_RESIST))
if(do_after(user, breakout_time, src, IGNORE_TARGET_LOC_CHANGE|IGNORE_HELD_ITEM))
if(!user || user.stat != CONSCIOUS || user.loc != src || opened || (!locked && !welded) )
return
//we check after a while whether there is a point of resisting anymore and whether the user is capable of resisting
code/game/objects/structures/watercloset.dm
+3 -3
View File
@@ -48,7 +48,7 @@
GM.visible_message("<span class='danger'>[user] starts to give [GM] a swirlie!</span>", "<span class='userdanger'>[user] starts to give you a swirlie...</span>")
swirlie = GM
var/was_alive = (swirlie.stat != DEAD)
if(do_after(user, 3 SECONDS, target = src))
if(do_after(user, 3 SECONDS, src))
GM.visible_message("<span class='danger'>[user] gives [GM] a swirlie!</span>", "<span class='userdanger'>[user] gives you a swirlie!</span>", "<span class='hear'>You hear a toilet flushing.</span>")
if(iscarbon(GM))
var/mob/living/carbon/C = GM
@@ -527,7 +527,7 @@
"<span class='notice'>You start washing your [washing_face ? "face" : "hands"]...</span>")
busy = TRUE
if(!do_after(user, 40, target = src))
if(!do_after(user, 4 SECONDS, src))
busy = FALSE
return
@@ -608,7 +608,7 @@
if(user.a_intent != INTENT_HARM)
to_chat(user, "<span class='notice'>You start washing [O]...</span>")
busy = TRUE
if(!do_after(user, 40, target = src))
if(!do_after(user, 4 SECONDS, src))
busy = FALSE
return 1
busy = FALSE