cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3651 from Verkister/waterslide

Browse Source 
Couple more flush tweaks.
This commit is contained in:
Razgriz
2022-02-10 12:23:37 -07:00
committed by GitHub
parent 4544be7d02 86e18daa98
commit e945df9fc6
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/game/objects/structures/watercloset_vr.dm
View File

@@ -14,7 +14,7 @@
exit_landmark = locate(/obj/effect/landmark/teleplumb_exit) exit_landmark = locate(/obj/effect/landmark/teleplumb_exit)
exit_container = locate(/obj/structure/biowaste_tank) exit_container = locate(/obj/structure/biowaste_tank)
if(exit_container) if(exit_container)
exit_landmark = exit_container exit_landmark = exit_container //Override landmark if container is available.
if(teleplumbed && exit_landmark) if(teleplumbed && exit_landmark)
desc = "The BS-500, a bluespace rift-rotation-based waste disposal unit for small matter. This one seems remarkably clean." desc = "The BS-500, a bluespace rift-rotation-based waste disposal unit for small matter. This one seems remarkably clean."
return ..() return ..()
@@ -25,6 +25,9 @@
for(var/obj/item/I in loc.contents) for(var/obj/item/I in loc.contents)
if(istype(I) && !I.anchored) if(istype(I) && !I.anchored)
bowl_contents += I bowl_contents += I
for(var/mob/living/L in loc.contents)
if(L.resting || L.lying && L.size_multiplier <= 0.75 && !L.buckled)
bowl_contents += L
if(bowl_contents.len) if(bowl_contents.len)
refilling = TRUE refilling = TRUE
user.visible_message("<span class='notice'>[user] flushes the toilet.</span>", "<span class='notice'>You flush the toilet.</span>") user.visible_message("<span class='notice'>[user] flushes the toilet.</span>", "<span class='notice'>You flush the toilet.</span>")
@@ -32,16 +35,18 @@
playsound(src, 'sound/effects/bubbles.ogg', 50, 1) playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
playsound(src, 'sound/mecha/powerup.ogg', 30, 1) playsound(src, 'sound/mecha/powerup.ogg', 30, 1)
var/bowl_conga = 0 var/bowl_conga = 0
for(var/obj/item/F in bowl_contents) for(var/atom/movable/F in bowl_contents)
if(bowl_conga < 150) if(bowl_conga < 150)
bowl_conga += 2 bowl_conga += 2
spawn(3 + bowl_conga) spawn(3 + bowl_conga)
F.SpinAnimation(5,3) F.SpinAnimation(5,3)
spawn(15) spawn(15)
F.forceMove(src) if(F.loc == loc)
F.forceMove(src)
spawn(refill_cooldown) spawn(refill_cooldown)
for(var/obj/item/F in bowl_contents) for(var/atom/movable/F in bowl_contents)
F.forceMove(exit_landmark) if(F.loc == src)
F.forceMove(exit_landmark)
bowl_contents.Cut() bowl_contents.Cut()
refilling = FALSE refilling = FALSE
return return
@@ -138,4 +143,4 @@
/mob/living/simple_mob/vore/aggressive/corrupthound/muffinmonster /mob/living/simple_mob/vore/aggressive/corrupthound/muffinmonster
name = "Muffin Monster" name = "Muffin Monster"
desc = "OH GOD IT'S LOOSE!" desc = "OH GOD IT'S LOOSE!"
vore_default_item_mode = IM_DIGEST vore_default_item_mode = IM_DIGEST