Revert "Purifies code, fix collapsible TGUI component"

This reverts commit 1f38f22a58.
This commit is contained in:
Mosley
2024-09-20 01:22:41 -05:00
parent 3a8024db6d
commit d0bf81dc09
8 changed files with 57 additions and 9 deletions

View File

@@ -67565,7 +67565,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/security/prison/upper)
"ykh" = (
/obj/structure/urinal{
/obj/structure/urinal/shit{
pixel_y = 30
},
/turf/open/floor/mineral/titanium/blue,

View File

@@ -24097,7 +24097,7 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"imF" = (
/obj/structure/urinal{
/obj/structure/urinal/shit{
pixel_y = 30
},
/turf/open/floor/mineral/titanium/blue,

View File

@@ -9084,7 +9084,7 @@
dir = 8;
pixel_x = -4
},
/obj/structure/urinal{
/obj/structure/urinal/shit{
pixel_y = 32
},
/turf/open/floor/plasteel/freezer,

View File

@@ -8755,7 +8755,7 @@
/area/ai_monitored/turret_protected/aisat/hallway)
"bxg" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/urinal{
/obj/structure/urinal/shit{
pixel_y = 4;
pixel_x = 26
},
@@ -101567,7 +101567,7 @@
icon_state = "0-8"
},
/obj/machinery/power/apc/auto_name/east,
/obj/structure/urinal{
/obj/structure/urinal/shit{
pixel_y = 34
},
/turf/open/floor/plasteel/freezer,

View File

@@ -1229,9 +1229,9 @@
if(obj_integrity < max_integrity)
if(!W.tool_start_check(user, amount=0))
return
user.visible_message("[user] is welding the airlock.", \
"<span class='notice'>You begin reparing the airlock...</span>", \
"<span class='italics'>You hear welding.</span>")
user.visible_message("[user] чинит шлюз сваркой.", \
"<span class='notice'>Вы начинаете чинить шлюз...</span>", \
"<span class='italics'>Вы слышите звук сварки.</span>")
if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(weld_checks), W, user)))
obj_integrity = max_integrity
machine_stat &= ~BROKEN

View File

@@ -174,8 +174,12 @@
var/exposed = 0 // can you currently put an item inside
var/obj/item/hiddenitem = null // what's in the urinal
/obj/structure/urinal/Initialize()
/obj/structure/urinal/Initialize(no_shit = FALSE)
. = ..()
if(!no_shit && prob(1))
new /obj/structure/urinal/shit(loc, dir)
qdel(src)
return
hiddenitem = new /obj/item/reagent_containers/food/urinalcake
/obj/structure/urinal/Destroy()

View File

@@ -1,3 +1,47 @@
/obj/structure/urinal/shit
name = "shit-stained urinal (Legendary object)"
desc = "The- dear God, what the fuck happened here?! Your eyes are met with a scene of absolute horror. The pungent stench of decay and neglect permeates the air, assaulting your senses and threatening to overpower your very soul. A primal scream of revulsion builds within you, but you suppress it, for you must brave this vile sight to bear witness to the grotesque aftermath. The urinal, once a symbol of utilitarian simplicity, now stands before you as a monument to the darkest depths of human depravity. Its porcelain surface, once pristine and immaculate, now resembles a nightmarish canvas upon which a malevolent artist has unleashed their chaotic fury. Brown streaks, like sinister brushstrokes, mar the once-white canvas, forming a grotesque abstract artistry of filth. The contents within this cursed receptacle defy all rationality and beg the question: How could such an unholy mess come into existence? Was it the consequence of an unruly horde of unbridled inebriation, carelessly and mercilessly defiling this sacred place? Or perhaps, the result of some demonic force that has chosen this mundane fixture as the battleground for a cosmic clash of excremental proportions? The splatters and smears, they speak of a calamity beyond comprehension, as if a malevolent tornado of fecal matter had torn through this tiny porcelain sanctuary. The very sight of it sends shivers down your spine, and you find yourself questioning the essence of humanity's decency. Oh, the inhumanity! This is not just a simple urinal, but a testament to the fall of civilization itself! It is as if all the horrors of the world have been distilled into this singular, stomach-churning spectacle, a repugnant symbol of our society's decline. You depart from this wretched place, but the haunting image of the shit-stained urinal will forever be etched in your mind, an enduring reminder of the fragility of order and the terrifying chaos that lurks beneath the surface of our civilization. May we learn from this abomination, lest we become lost in the abyss of our own decay."
icon = 'modular_splurt/icons/obj/structures/bathroom.dmi'
icon_state = "shit_urinal"
/obj/structure/urinal/shit/Initialize()
. = ..()
QDEL_NULL(hiddenitem)
/obj/structure/urinal/shit/examine(mob/user)
. = ..()
if(iscarbon(user) && prob(5))
var/mob/living/carbon/C = user
C.vomit()
/obj/structure/urinal/shit/attackby(obj/item/I, mob/living/user, params)
. = COMPONENT_NO_AFTERATTACK
if(!ishuman(user))
return ..()
var/mob/living/carbon/human/H = user
if(istype(I, /obj/item/soap))
if(!istype(H.gloves, /obj/item/clothing/gloves/color/latex))
to_chat(H, span_warning("No! No fucking way I'm touching this shit without at LEAST latex gloves!"))
return
if(!istype(H.get_inactive_held_item(), /obj/item/storage/bag/trash))
to_chat(H, span_warning("I'd.. need a trashbag or similar to stash all this shit."))
return
H.visible_message(span_notice("[H] starts cleaning \the [src]![prob(0.1) ? " All for free.." : ""]"), span_notice("You start.. scooping all the shit into the trash bag.. Eugh."))
if(!do_after(H, 130, target = src))
H.visible_message(span_notice("[H] gives up!"), span_warning("Fuck this shit."))
return
H.visible_message(span_notice("[H] finishes cleaning \the [src]!"), span_notice("You're finally done. Thank fuck."))
var /obj/structure/urinal/cleaned = new /obj/structure/urinal(loc, dir, TRUE)
cleaned.pixel_y = src.pixel_y
cleaned.pixel_x = src.pixel_x
qdel(src)
return
return ..()
/obj/structure/urinal/shit/screwdriver_act(mob/living/user, obj/item/I)
return FALSE
/obj/structure/curtain
icon_state = "curtain_open"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB