diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 0a08edb9b2..d85c8b12d6 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -761,7 +761,7 @@ }, /area/awaymission/moonoutpost19/syndicate) "bF" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/high_loot{ dir = 1 }, /turf/open/floor/plasteel/freezer{ @@ -4121,7 +4121,7 @@ }, /area/awaymission/moonoutpost19/research) "hP" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/high_loot{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -4473,7 +4473,7 @@ }, /area/awaymission/moonoutpost19/research) "iw" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/high_loot{ dir = 4 }, /obj/machinery/light/small{ @@ -4764,7 +4764,7 @@ }, /area/awaymission/moonoutpost19/arrivals) "iZ" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/high_loot{ dir = 1 }, /turf/open/floor/plasteel/freezer{ diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index c24bf45f81..a40066df4f 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -5939,7 +5939,7 @@ /turf/open/floor/plasteel, /area/awaymission/snowdin/post/garage) "mD" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/high_loot{ dir = 1 }, /obj/machinery/light/small, @@ -8796,7 +8796,7 @@ /turf/open/floor/plasteel/showroomfloor, /area/awaymission/snowdin/post/cavern2) "tk" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/high_loot{ dir = 1 }, /turf/open/floor/plasteel/showroomfloor, @@ -9643,7 +9643,7 @@ /turf/open/floor/plasteel/showroomfloor, /area/awaymission/snowdin/post/cavern1) "vE" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/high_loot{ dir = 1 }, /turf/open/floor/plasteel/showroomfloor, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index c8cd2ab499..3b2ee52e24 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1337,7 +1337,7 @@ /turf/open/floor/plasteel, /area/security/prison) "adf" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/prison{ dir = 1 }, /turf/open/floor/plasteel/freezer, @@ -13056,7 +13056,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/cryopod) "aDL" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 4 }, /obj/structure/mirror{ @@ -13944,7 +13944,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "aGk" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 4 }, /obj/structure/mirror{ @@ -21467,7 +21467,7 @@ /turf/open/floor/plating, /area/maintenance/port) "aZt" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 4 }, /obj/structure/mirror{ @@ -57483,7 +57483,7 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "oIW" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 8 }, /turf/open/floor/mineral/titanium/blue, @@ -60606,7 +60606,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/fitness/pool) "ycd" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 4 }, /obj/structure/mirror{ diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index a4ba19dd57..61ed3edba7 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -12048,7 +12048,7 @@ "aAm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit/old, -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 8 }, /obj/machinery/newscaster{ @@ -12059,7 +12059,7 @@ /area/crew_quarters/toilet/auxiliary) "aAn" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 8 }, /obj/machinery/newscaster{ @@ -12071,7 +12071,7 @@ /area/crew_quarters/toilet/auxiliary) "aAo" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 8 }, /obj/machinery/newscaster{ @@ -19681,7 +19681,7 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "aNx" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/prison{ dir = 4 }, /obj/machinery/light/small{ @@ -59858,6 +59858,7 @@ /area/crew_quarters/heads/captain) "bXh" = ( /obj/structure/toilet{ + contents = newlist(/obj/item/toy/snappop/phoenix); dir = 4 }, /obj/machinery/light{ @@ -82141,7 +82142,7 @@ "cIa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit/old, -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 8 }, /obj/machinery/newscaster{ @@ -82152,7 +82153,7 @@ /area/crew_quarters/toilet/restrooms) "cIb" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 8 }, /obj/machinery/newscaster{ @@ -82164,7 +82165,7 @@ /area/crew_quarters/toilet/restrooms) "cIc" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 8 }, /obj/machinery/newscaster{ @@ -89653,7 +89654,7 @@ }, /area/medical/storage) "cUP" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -116756,7 +116757,7 @@ /turf/open/floor/plasteel, /area/maintenance/port/aft) "dPN" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 8 }, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 446fe3e519..3e12c8ec86 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -56558,7 +56558,7 @@ pixel_x = -12; pixel_y = 2 }, -/obj/structure/toilet{ +/obj/structure/toilet/secret/prison{ pixel_y = 16 }, /obj/effect/turf_decal/tile/neutral{ @@ -56908,7 +56908,7 @@ /area/hallway/primary/central) "bKT" = ( /obj/effect/turf_decal/box, -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 8 }, /obj/structure/mirror{ @@ -56941,7 +56941,7 @@ /area/crew_quarters/toilet/restrooms) "bKU" = ( /obj/effect/turf_decal/box, -/obj/structure/toilet{ +//obj/structure/toilet/secret/low_loot{ dir = 8 }, /obj/structure/mirror{ @@ -59908,7 +59908,7 @@ pixel_x = -12; pixel_y = 2 }, -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ pixel_y = 16 }, /obj/effect/turf_decal/tile/neutral{ @@ -62988,7 +62988,7 @@ pixel_x = -12; pixel_y = 2 }, -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ pixel_y = 16 }, /obj/effect/turf_decal/tile/neutral{ diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm index 431f94bb32..6d1469d483 100644 --- a/_maps/map_files/LambdaStation/lambda.dmm +++ b/_maps/map_files/LambdaStation/lambda.dmm @@ -3033,7 +3033,7 @@ /turf/open/floor/plasteel, /area/security/prison) "agR" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/prison{ dir = 8 }, /turf/open/floor/plasteel/freezer, @@ -59988,7 +59988,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "ccw" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 4 }, /obj/machinery/light/small{ @@ -60523,7 +60523,7 @@ /turf/open/floor/plating, /area/maintenance/fore) "cdE" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 4 }, /obj/effect/landmark/blobstart, @@ -60557,7 +60557,7 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet) "cdH" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 8 }, /obj/machinery/light/small{ @@ -83922,7 +83922,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "cXf" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 8 }, /obj/machinery/light/small{ diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 0d8d956184..e6eddb2777 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1028,7 +1028,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/toilet{ +/obj/structure/toilet/secret/prison{ dir = 4 }, /turf/open/floor/plasteel/freezer, @@ -15496,7 +15496,7 @@ }, /area/maintenance/fore) "aDP" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ pixel_y = 8 }, /obj/machinery/light/small{ @@ -16890,7 +16890,7 @@ /turf/open/floor/plating, /area/maintenance/fore) "aGz" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ pixel_y = 8 }, /obj/machinery/light/small{ @@ -18173,7 +18173,7 @@ /turf/open/floor/plating, /area/maintenance/fore) "aJa" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ pixel_y = 8 }, /obj/machinery/light/small{ @@ -18200,7 +18200,7 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/restrooms) "aJc" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 4 }, /obj/machinery/light/small{ @@ -32280,7 +32280,7 @@ /turf/open/floor/plasteel/white, /area/crew_quarters/heads/captain/private) "bkL" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ pixel_y = 13 }, /obj/machinery/light, @@ -40361,7 +40361,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bBp" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ pixel_y = 8 }, /obj/machinery/light/small{ @@ -41832,7 +41832,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bEv" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ pixel_y = 8 }, /obj/machinery/light/small{ @@ -43537,7 +43537,7 @@ /turf/open/floor/plating, /area/crew_quarters/toilet/auxiliary) "bHQ" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ pixel_y = 8 }, /obj/machinery/light/small{ diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 465f03bb6e..f1380ec2f5 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -2285,7 +2285,7 @@ /turf/open/floor/plasteel, /area/security/prison) "ahb" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/prison{ dir = 8 }, /turf/open/floor/plasteel/freezer, @@ -9106,7 +9106,7 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/heads/captain) "avK" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 8 }, /turf/open/floor/plasteel/freezer, @@ -14667,7 +14667,7 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/restrooms) "aIl" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 8 }, /obj/machinery/light/small{ @@ -16490,7 +16490,7 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/cafeteria/lunchroom) "aNc" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 4 }, /obj/effect/landmark/start/assistant, @@ -47393,7 +47393,7 @@ /turf/open/floor/plasteel/grimy, /area/chapel/main/monastery) "cgO" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ pixel_y = 8 }, /obj/machinery/light/small{ @@ -47734,7 +47734,7 @@ /turf/open/floor/plasteel/grimy, /area/chapel/main/monastery) "ciq" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ pixel_y = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -55939,7 +55939,7 @@ /turf/open/floor/carpet, /area/chapel/office) "kgR" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 4 }, /turf/open/floor/plating, diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index f225723fc3..892d85cd6e 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -112,19 +112,18 @@ . = ..() if (secret_type) secret = new secret_type(src) - secret.desc += " It's a secret!" - w_items += secret.w_class + secret.desc += "" //In case you want to add something to the item that spawns contents += secret -/obj/structure/toilet/secret/prison - secret_type = /obj/effect/spawner/lootdrop/prison_loot_toilet - /obj/structure/toilet/secret/low_loot secret_type = /obj/effect/spawner/lootdrop/low_loot_toilet /obj/structure/toilet/secret/high_loot secret_type = /obj/effect/spawner/lootdrop/high_loot_toilet +/obj/structure/toilet/secret/prison + secret_type = /obj/effect/spawner/lootdrop/prison_loot_toilet + /obj/structure/urinal name = "urinal" desc = "The HU-452, an experimental urinal. Comes complete with experimental urinal cake."