cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small toilet fix and funny feature. (#7070)

Browse Source
This commit is contained in:
Verkister
2023-10-05 01:31:32 +03:00
committed by GitHub
parent a3e9d7eb77
commit 7bb5e41029
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modular_chomp/code/game/objects/structures/watercloset_ch.dm
View File

@@ -10,6 +10,7 @@
var/no_destination = TRUE var/no_destination = TRUE
var/max_w_class = 3 //glogged var/max_w_class = 3 //glogged
var/total_w = 0 var/total_w = 0
var/panic_mult = 1
/obj/structure/toilet/Initialize() /obj/structure/toilet/Initialize()
if(z in global.using_map.map_levels) if(z in global.using_map.map_levels)
@@ -25,7 +26,9 @@
return ..() return ..()
/obj/structure/toilet/attack_hand(mob/living/user as mob) /obj/structure/toilet/attack_hand(mob/living/user as mob)
if(open && !refilling && no_destination || (teleplumbed && exit_landmark)) if(open && !refilling && (no_destination || (teleplumbed && exit_landmark)))
if(user.a_intent == I_HURT)
panic_mult += 1
var/list/bowl_contents = list() var/list/bowl_contents = list()
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)
@@ -34,7 +37,6 @@
if((L.resting || L.lying) && !L.buckled) if((L.resting || L.lying) && !L.buckled)
bowl_contents += L bowl_contents += L
if(bowl_contents.len) if(bowl_contents.len)
refilling = TRUE
user.visible_message("<span class='notice'>[user] flushes the [lowertext(name)].</span>", "<span class='notice'>You flush the [lowertext(name)].</span>") user.visible_message("<span class='notice'>[user] flushes the [lowertext(name)].</span>", "<span class='notice'>You flush the [lowertext(name)].</span>")
playsound(src, 'sound/vore/death7.ogg', 50, 1) //Got lazy about getting new sound files. Have a sick remix lmao. playsound(src, 'sound/vore/death7.ogg', 50, 1) //Got lazy about getting new sound files. Have a sick remix lmao.
playsound(src, 'sound/effects/bubbles.ogg', 50, 1) playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
@@ -54,12 +56,14 @@
if(isliving(F)) if(isliving(F))
var/mob/living/L = F var/mob/living/L = F
total_w += L.size_multiplier * 13 total_w += L.size_multiplier * 13
if(total_w <= max_w_class) if(total_w <= max_w_class * panic_mult)
taken_contents |= F taken_contents |= F
F.forceMove(src) F.forceMove(src)
else else
visible_message("The [lowertext(name)] glurks and splutters, unable to guzzle more stuff down in a single flush!") visible_message("The [lowertext(name)] glurks and splutters, unable to guzzle more stuff down in a single flush!")
break break
refilling = TRUE
panic_mult = 1
spawn(refill_cooldown) spawn(refill_cooldown)
for(var/atom/movable/F in taken_contents) for(var/atom/movable/F in taken_contents)
if(F.loc == src) if(F.loc == src)
@@ -69,6 +73,8 @@
total_w = 0 total_w = 0
refilling = FALSE refilling = FALSE
return return
else
panic_mult = 1
if(refilling) if(refilling)
playsound(src, 'sound/machines/door_locked.ogg', 30, 1) playsound(src, 'sound/machines/door_locked.ogg', 30, 1)
to_chat(user, "<span class='notice'>The [lowertext(name)] is still refilling its tank.</span>") to_chat(user, "<span class='notice'>The [lowertext(name)] is still refilling its tank.</span>")