From 62509ab4a93b7dea509ee19e096b9ad7513943c2 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Sat, 4 Apr 2020 10:16:43 -0400 Subject: [PATCH 1/6] the mapping side --- _maps/RandomZLevels/moonoutpost19.dmm | 8 ++++---- _maps/RandomZLevels/snowdin.dmm | 6 +++--- _maps/map_files/BoxStation/BoxStation.dmm | 12 ++++++------ .../map_files/Deltastation/DeltaStation2.dmm | 19 ++++++++++--------- _maps/map_files/KiloStation/KiloStation.dmm | 10 +++++----- _maps/map_files/LambdaStation/lambda.dmm | 10 +++++----- _maps/map_files/MetaStation/MetaStation.dmm | 18 +++++++++--------- _maps/map_files/PubbyStation/PubbyStation.dmm | 14 +++++++------- code/game/objects/structures/watercloset.dm | 2 +- 9 files changed, 50 insertions(+), 49 deletions(-) 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 be0bf9306e..782f288d39 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{ @@ -57504,7 +57504,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, @@ -60647,7 +60647,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 54b5a9c221..de15729fbf 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -12043,7 +12043,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{ @@ -12054,7 +12054,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{ @@ -12066,7 +12066,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{ @@ -19676,7 +19676,7 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "aNx" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/prison{ dir = 4 }, /obj/machinery/light/small{ @@ -59853,6 +59853,7 @@ /area/crew_quarters/heads/captain) "bXh" = ( /obj/structure/toilet{ + contents = newlist(/obj/item/toy/snappop/phoenix); dir = 4 }, /obj/machinery/light{ @@ -82136,7 +82137,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{ @@ -82147,7 +82148,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{ @@ -82159,7 +82160,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{ @@ -89648,7 +89649,7 @@ }, /area/medical/storage) "cUP" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -116751,7 +116752,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 808d2f5ccb..58f0e4a3a9 100644 --- a/_maps/map_files/LambdaStation/lambda.dmm +++ b/_maps/map_files/LambdaStation/lambda.dmm @@ -3037,7 +3037,7 @@ /turf/open/floor/plasteel, /area/security/prison) "agR" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/prison{ dir = 8 }, /turf/open/floor/plasteel/freezer, @@ -60076,7 +60076,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{ @@ -60612,7 +60612,7 @@ /turf/open/floor/plating, /area/maintenance/fore) "cdE" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ dir = 4 }, /obj/effect/landmark/blobstart, @@ -60646,7 +60646,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{ @@ -84043,7 +84043,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 375b841141..7362f36d9e 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, @@ -15438,7 +15438,7 @@ }, /area/maintenance/fore) "aDP" = ( -/obj/structure/toilet{ +/obj/structure/toilet/secret/low_loot{ pixel_y = 8 }, /obj/machinery/light/small{ @@ -16832,7 +16832,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{ @@ -18115,7 +18115,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{ @@ -18142,7 +18142,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{ @@ -32222,7 +32222,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, @@ -40332,7 +40332,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{ @@ -41803,7 +41803,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{ @@ -43508,7 +43508,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 fc5f6e9778..901f100ae5 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 ba5b509608..b81cd3345b 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -112,7 +112,7 @@ . = ..() if (secret_type) secret = new secret_type(src) - secret.desc += " It's a secret!" + secret.desc += "" //In case you want to add something to the item that spawns w_items += secret.w_class contents += secret From c3aaf27aa26881862d5aa7d3e44baa707921bf24 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Sat, 4 Apr 2020 10:23:14 -0400 Subject: [PATCH 2/6] Revert "effort" This reverts commit 10ca01cc95c8fd9ce940bd125d589baea3ba92fa. --- .../game/objects/effects/spawners/lootdrop.dm | 141 +----------------- code/game/objects/structures/watercloset.dm | 18 ++- 2 files changed, 15 insertions(+), 144 deletions(-) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index f8bcf198f5..71c394a404 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -45,6 +45,7 @@ /obj/effect/spawner/lootdrop/armory_contraband name = "armory contraband gun spawner" lootdoubles = FALSE + loot = list( /obj/item/gun/ballistic/automatic/pistol = 8, /obj/item/gun/ballistic/shotgun/automatic/combat = 5, @@ -128,6 +129,7 @@ loot = typesof(/obj/item/flashlight/glowstick) . = ..() + /obj/effect/spawner/lootdrop/gloves name = "random gloves" desc = "These gloves are supposed to be a random color..." @@ -148,6 +150,7 @@ /obj/effect/spawner/lootdrop/crate_spawner name = "lootcrate spawner" //USE PROMO CODE "SELLOUT" FOR 20% OFF! lootdoubles = FALSE + loot = list( /obj/structure/closet/crate/secure/loot = 20, "" = 80 @@ -383,141 +386,3 @@ /obj/structure/reagent_dispensers/keg/aphro = 2, /obj/structure/reagent_dispensers/keg/aphro/strong = 2, /obj/structure/reagent_dispensers/keg/gargle = 1) - -/obj/effect/spawner/lootdrop/coin - lootcount = 1 - loot = list( - /obj/item/coin/silver = 30, - /obj/item/coin/iron = 30, - /obj/item/coin/gold = 10, - /obj/item/coin/diamond = 10, - /obj/item/coin/plasma = 10, - /obj/item/coin/uranium = 10, - ) - -/obj/effect/spawner/lootdrop/cig_packs - lootcount = 1 - loot = list( - /obj/item/storage/fancy/cigarettes = 20, - /obj/item/storage/fancy/cigarettes/dromedaryco = 10, - /obj/item/storage/fancy/cigarettes/cigpack_robust = 5, - /obj/item/storage/fancy/cigarettes/cigpack_robustgold = 5, - /obj/item/storage/fancy/cigarettes/cigpack_carp = 15, - /obj/item/storage/fancy/cigarettes/cigpack_syndicate = 2, - /obj/item/storage/fancy/cigarettes/cigpack_midori = 10, - /obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 5, - /obj/item/storage/fancy/cigarettes/cigpack_xeno = 3, - /obj/item/storage/fancy/cigarettes/cigpack_cannabis = 10, - /obj/item/storage/fancy/cigarettes/cigpack_mindbreaker = 10, - /obj/item/storage/fancy/rollingpapers = 10 - ) - -/obj/effect/spawner/lootdrop/cigars_cases - lootcount = 1 - loot = list( - /obj/item/storage/fancy/cigarettes/cigars = 50, - /obj/item/storage/fancy/cigarettes/cigars/cohiba = 25, - /obj/item/storage/fancy/cigarettes/cigars/havana = 25, - ) - -/obj/effect/spawner/lootdrop/space_cash - lootcount = 1 - loot = list( - /obj/item/stack/spacecash/c1 = 1, - /obj/item/stack/spacecash/c10 = 9, - /obj/item/stack/spacecash/c20 = 10, - /obj/item/stack/spacecash/c50 = 15, - /obj/item/stack/spacecash/c100 = 25, - /obj/item/stack/spacecash/c200 = 20, - /obj/item/stack/spacecash/c500 = 19, - /obj/item/stack/spacecash/c1000 = 1, - ) - -/obj/effect/spawner/lootdrop/druggie_pill - lootcount = 1 - loot = list( - /obj/item/reagent_containers/pill/stimulant = 1, - /obj/item/reagent_containers/pill/zoom = 9, - /obj/item/reagent_containers/pill/happy = 10, - /obj/item/reagent_containers/pill/lsd = 15, - /obj/item/reagent_containers/pill/aranesp = 25, - /obj/item/reagent_containers/pill/psicodine = 20, - /obj/item/reagent_containers/pill/mannitol = 19, - /obj/item/reagent_containers/pill/happiness = 1, - ) - -/obj/effect/spawner/lootdrop/low_loot_toilet - name = "random low toilet spawner" - lootcount = 1 -//Note this is out of a 100 - Meaning the number you see is also the percent its going to pick that -//This is ment for "low" loot that anyone could fine in a toilet, for better gear use high loot toilet - loot = list("" = 30, - /obj/item/lighter = 2, - /obj/item/tape/random = 1, - /obj/item/poster/random_contraband = 1, - /obj/item/clothing/glasses/sunglasses/blindfold = 4, - /obj/item/clothing/glasses/sunglasses = 1, - /obj/item/toy/plush/random = 5, - /obj/effect/spawner/lootdrop/gloves = 5, - /obj/effect/spawner/lootdrop/glowstick = 5, - /obj/effect/spawner/lootdrop/coin = 3, - /obj/effect/spawner/lootdrop/cig_packs = 10, - /obj/effect/spawner/lootdrop/cigars_cases = 2, - /obj/effect/spawner/lootdrop/space_cash = 5, - /obj/item/reagent_containers/food/snacks/grown/cannabis = 5, - /obj/item/storage/pill_bottle/dice = 5, - /obj/item/toy/cards/deck = 5, - /obj/effect/spawner/lootdrop/druggie_pill = 5 - ) - -/obj/effect/spawner/lootdrop/prison_loot_toilet - name = "random prison toilet spawner" - lootcount = 1 -//Note this is out of a 100 - Meaning the number you see is also the percent its going to pick that -//This is ment for "prison" loot that is rather rare and ment for "prisoners if they get a crowbar to fine, or sec. - loot = list("" = 10, - /obj/item/lighter = 5, - /obj/item/poster/random_contraband = 5, - /obj/item/clothing/glasses/sunglasses = 5, - /obj/effect/spawner/lootdrop/coin = 5, - /obj/effect/spawner/lootdrop/cig_packs = 10, - /obj/effect/spawner/lootdrop/cigars_cases = 5, - /obj/item/reagent_containers/food/snacks/grown/cannabis = 5, - /obj/item/storage/pill_bottle/dice = 5, - /obj/item/toy/cards/deck = 5, - /obj/effect/spawner/lootdrop/druggie_pill = 5, - /obj/item/kitchen/knife = 5, - /obj/item/screwdriver = 5, - /obj/item/crowbar/red = 0.5, //Dont your need a crowbar to open this? - /obj/item/stack/medical/bruise_pack = 3, - /obj/item/reagent_containers/food/drinks/bottle/vodka = 2, - /obj/item/radio = 5, - /obj/item/flashlight = 4.5, - /obj/item/clothing/mask/breath = 2, - /obj/item/tank/internals/emergency_oxygen = 3, - /obj/item/storage/box/mre/menu4/safe = 3, - /obj/item/grenade/smokebomb = 2 - ) - -/obj/effect/spawner/lootdrop/high_loot_toilet - name = "random high toilet spawner" - lootcount = 1 -//Note this is out of a 100 - Meaning the number you see is also the percent its going to pick that -//The items inside are always going to be something usefull, illegal and likely traitorous. - loot = list( - /obj/item/clothing/glasses/sunglasses = 5, - /obj/effect/spawner/lootdrop/coin = 5, - /obj/effect/spawner/lootdrop/space_cash = 5, - /obj/effect/spawner/lootdrop/druggie_pill = 5, - /obj/item/storage/fancy/cigarettes/cigpack_syndicate = 5, - /obj/item/suppressor = 5, - /obj/item/toy/cards/deck/syndicate = 5, - /obj/item/clothing/under/syndicate = 5, - /obj/item/clothing/mask/gas/syndicate = 5, - /obj/item/grenade/smokebomb = 10, - /obj/item/gun/ballistic/automatic/toy/pistol = 5, - /obj/item/firing_pin = 5, - /obj/item/grenade/empgrenade = 15, - /obj/item/clothing/gloves/combat = 10, - /obj/item/clothing/shoes/sneakers/noslip = 10 - ) \ No newline at end of file diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index b81cd3345b..d27b2c260a 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -12,11 +12,13 @@ var/w_items = 0 //the combined w_class of all the items in the cistern var/mob/living/swirlie = null //the mob being given a swirlie + /obj/structure/toilet/Initialize() . = ..() open = round(rand(0, 1)) update_icon() + /obj/structure/toilet/attack_hand(mob/living/user) . = ..() if(.) @@ -69,9 +71,11 @@ open = !open update_icon() + /obj/structure/toilet/update_icon_state() icon_state = "toilet[open][cistern]" + /obj/structure/toilet/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/crowbar)) to_chat(user, "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]...") @@ -116,14 +120,8 @@ w_items += secret.w_class contents += secret -/obj/structure/toilet/secret/prison //We care about you Skyrats! - 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/urinal name = "urinal" @@ -196,6 +194,7 @@ exposed = !exposed return TRUE + /obj/item/reagent_containers/food/urinalcake name = "urinal cake" desc = "The noble urinal cake, protecting the station's pipes from the station's pee. Do not eat." @@ -279,6 +278,7 @@ add_hiddenprint(user) return TRUE + /obj/machinery/shower/update_overlays() . = ..() if(on) @@ -315,6 +315,7 @@ else if(isobj(AM)) wash_obj(AM) + /obj/machinery/shower/proc/wash_obj(obj/O) . = SEND_SIGNAL(O, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK) . = O.clean_blood() @@ -324,6 +325,7 @@ I.acid_level = 0 I.extinguish() + /obj/machinery/shower/proc/wash_turf() if(isturf(loc)) var/turf/tile = loc @@ -334,6 +336,7 @@ if(is_cleanable(E)) qdel(E) + /obj/machinery/shower/proc/wash_mob(mob/living/L) SEND_SIGNAL(L, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK) L.wash_cream() @@ -664,9 +667,11 @@ /obj/structure/sink/puddle/deconstruct(disassembled = TRUE) qdel(src) + //Shower Curtains// //Defines used are pre-existing in layers.dm// + /obj/structure/curtain name = "curtain" desc = "Contains less than 1% mercury." @@ -722,6 +727,7 @@ return TRUE + /obj/structure/curtain/attack_hand(mob/user) . = ..() if(.) From 15d9c9f0aed0f149f10b5fa999844d2735345f16 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Sat, 4 Apr 2020 11:01:21 -0400 Subject: [PATCH 3/6] Revert "Revert "effort"" This reverts commit c3aaf27aa26881862d5aa7d3e44baa707921bf24. --- .../game/objects/effects/spawners/lootdrop.dm | 141 +++++++++++++++++- code/game/objects/structures/watercloset.dm | 18 +-- 2 files changed, 144 insertions(+), 15 deletions(-) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 71c394a404..f8bcf198f5 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -45,7 +45,6 @@ /obj/effect/spawner/lootdrop/armory_contraband name = "armory contraband gun spawner" lootdoubles = FALSE - loot = list( /obj/item/gun/ballistic/automatic/pistol = 8, /obj/item/gun/ballistic/shotgun/automatic/combat = 5, @@ -129,7 +128,6 @@ loot = typesof(/obj/item/flashlight/glowstick) . = ..() - /obj/effect/spawner/lootdrop/gloves name = "random gloves" desc = "These gloves are supposed to be a random color..." @@ -150,7 +148,6 @@ /obj/effect/spawner/lootdrop/crate_spawner name = "lootcrate spawner" //USE PROMO CODE "SELLOUT" FOR 20% OFF! lootdoubles = FALSE - loot = list( /obj/structure/closet/crate/secure/loot = 20, "" = 80 @@ -386,3 +383,141 @@ /obj/structure/reagent_dispensers/keg/aphro = 2, /obj/structure/reagent_dispensers/keg/aphro/strong = 2, /obj/structure/reagent_dispensers/keg/gargle = 1) + +/obj/effect/spawner/lootdrop/coin + lootcount = 1 + loot = list( + /obj/item/coin/silver = 30, + /obj/item/coin/iron = 30, + /obj/item/coin/gold = 10, + /obj/item/coin/diamond = 10, + /obj/item/coin/plasma = 10, + /obj/item/coin/uranium = 10, + ) + +/obj/effect/spawner/lootdrop/cig_packs + lootcount = 1 + loot = list( + /obj/item/storage/fancy/cigarettes = 20, + /obj/item/storage/fancy/cigarettes/dromedaryco = 10, + /obj/item/storage/fancy/cigarettes/cigpack_robust = 5, + /obj/item/storage/fancy/cigarettes/cigpack_robustgold = 5, + /obj/item/storage/fancy/cigarettes/cigpack_carp = 15, + /obj/item/storage/fancy/cigarettes/cigpack_syndicate = 2, + /obj/item/storage/fancy/cigarettes/cigpack_midori = 10, + /obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 5, + /obj/item/storage/fancy/cigarettes/cigpack_xeno = 3, + /obj/item/storage/fancy/cigarettes/cigpack_cannabis = 10, + /obj/item/storage/fancy/cigarettes/cigpack_mindbreaker = 10, + /obj/item/storage/fancy/rollingpapers = 10 + ) + +/obj/effect/spawner/lootdrop/cigars_cases + lootcount = 1 + loot = list( + /obj/item/storage/fancy/cigarettes/cigars = 50, + /obj/item/storage/fancy/cigarettes/cigars/cohiba = 25, + /obj/item/storage/fancy/cigarettes/cigars/havana = 25, + ) + +/obj/effect/spawner/lootdrop/space_cash + lootcount = 1 + loot = list( + /obj/item/stack/spacecash/c1 = 1, + /obj/item/stack/spacecash/c10 = 9, + /obj/item/stack/spacecash/c20 = 10, + /obj/item/stack/spacecash/c50 = 15, + /obj/item/stack/spacecash/c100 = 25, + /obj/item/stack/spacecash/c200 = 20, + /obj/item/stack/spacecash/c500 = 19, + /obj/item/stack/spacecash/c1000 = 1, + ) + +/obj/effect/spawner/lootdrop/druggie_pill + lootcount = 1 + loot = list( + /obj/item/reagent_containers/pill/stimulant = 1, + /obj/item/reagent_containers/pill/zoom = 9, + /obj/item/reagent_containers/pill/happy = 10, + /obj/item/reagent_containers/pill/lsd = 15, + /obj/item/reagent_containers/pill/aranesp = 25, + /obj/item/reagent_containers/pill/psicodine = 20, + /obj/item/reagent_containers/pill/mannitol = 19, + /obj/item/reagent_containers/pill/happiness = 1, + ) + +/obj/effect/spawner/lootdrop/low_loot_toilet + name = "random low toilet spawner" + lootcount = 1 +//Note this is out of a 100 - Meaning the number you see is also the percent its going to pick that +//This is ment for "low" loot that anyone could fine in a toilet, for better gear use high loot toilet + loot = list("" = 30, + /obj/item/lighter = 2, + /obj/item/tape/random = 1, + /obj/item/poster/random_contraband = 1, + /obj/item/clothing/glasses/sunglasses/blindfold = 4, + /obj/item/clothing/glasses/sunglasses = 1, + /obj/item/toy/plush/random = 5, + /obj/effect/spawner/lootdrop/gloves = 5, + /obj/effect/spawner/lootdrop/glowstick = 5, + /obj/effect/spawner/lootdrop/coin = 3, + /obj/effect/spawner/lootdrop/cig_packs = 10, + /obj/effect/spawner/lootdrop/cigars_cases = 2, + /obj/effect/spawner/lootdrop/space_cash = 5, + /obj/item/reagent_containers/food/snacks/grown/cannabis = 5, + /obj/item/storage/pill_bottle/dice = 5, + /obj/item/toy/cards/deck = 5, + /obj/effect/spawner/lootdrop/druggie_pill = 5 + ) + +/obj/effect/spawner/lootdrop/prison_loot_toilet + name = "random prison toilet spawner" + lootcount = 1 +//Note this is out of a 100 - Meaning the number you see is also the percent its going to pick that +//This is ment for "prison" loot that is rather rare and ment for "prisoners if they get a crowbar to fine, or sec. + loot = list("" = 10, + /obj/item/lighter = 5, + /obj/item/poster/random_contraband = 5, + /obj/item/clothing/glasses/sunglasses = 5, + /obj/effect/spawner/lootdrop/coin = 5, + /obj/effect/spawner/lootdrop/cig_packs = 10, + /obj/effect/spawner/lootdrop/cigars_cases = 5, + /obj/item/reagent_containers/food/snacks/grown/cannabis = 5, + /obj/item/storage/pill_bottle/dice = 5, + /obj/item/toy/cards/deck = 5, + /obj/effect/spawner/lootdrop/druggie_pill = 5, + /obj/item/kitchen/knife = 5, + /obj/item/screwdriver = 5, + /obj/item/crowbar/red = 0.5, //Dont your need a crowbar to open this? + /obj/item/stack/medical/bruise_pack = 3, + /obj/item/reagent_containers/food/drinks/bottle/vodka = 2, + /obj/item/radio = 5, + /obj/item/flashlight = 4.5, + /obj/item/clothing/mask/breath = 2, + /obj/item/tank/internals/emergency_oxygen = 3, + /obj/item/storage/box/mre/menu4/safe = 3, + /obj/item/grenade/smokebomb = 2 + ) + +/obj/effect/spawner/lootdrop/high_loot_toilet + name = "random high toilet spawner" + lootcount = 1 +//Note this is out of a 100 - Meaning the number you see is also the percent its going to pick that +//The items inside are always going to be something usefull, illegal and likely traitorous. + loot = list( + /obj/item/clothing/glasses/sunglasses = 5, + /obj/effect/spawner/lootdrop/coin = 5, + /obj/effect/spawner/lootdrop/space_cash = 5, + /obj/effect/spawner/lootdrop/druggie_pill = 5, + /obj/item/storage/fancy/cigarettes/cigpack_syndicate = 5, + /obj/item/suppressor = 5, + /obj/item/toy/cards/deck/syndicate = 5, + /obj/item/clothing/under/syndicate = 5, + /obj/item/clothing/mask/gas/syndicate = 5, + /obj/item/grenade/smokebomb = 10, + /obj/item/gun/ballistic/automatic/toy/pistol = 5, + /obj/item/firing_pin = 5, + /obj/item/grenade/empgrenade = 15, + /obj/item/clothing/gloves/combat = 10, + /obj/item/clothing/shoes/sneakers/noslip = 10 + ) \ No newline at end of file diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index d27b2c260a..b81cd3345b 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -12,13 +12,11 @@ var/w_items = 0 //the combined w_class of all the items in the cistern var/mob/living/swirlie = null //the mob being given a swirlie - /obj/structure/toilet/Initialize() . = ..() open = round(rand(0, 1)) update_icon() - /obj/structure/toilet/attack_hand(mob/living/user) . = ..() if(.) @@ -71,11 +69,9 @@ open = !open update_icon() - /obj/structure/toilet/update_icon_state() icon_state = "toilet[open][cistern]" - /obj/structure/toilet/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/crowbar)) to_chat(user, "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]...") @@ -120,8 +116,14 @@ w_items += secret.w_class contents += secret +/obj/structure/toilet/secret/prison //We care about you Skyrats! + 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/urinal name = "urinal" @@ -194,7 +196,6 @@ exposed = !exposed return TRUE - /obj/item/reagent_containers/food/urinalcake name = "urinal cake" desc = "The noble urinal cake, protecting the station's pipes from the station's pee. Do not eat." @@ -278,7 +279,6 @@ add_hiddenprint(user) return TRUE - /obj/machinery/shower/update_overlays() . = ..() if(on) @@ -315,7 +315,6 @@ else if(isobj(AM)) wash_obj(AM) - /obj/machinery/shower/proc/wash_obj(obj/O) . = SEND_SIGNAL(O, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK) . = O.clean_blood() @@ -325,7 +324,6 @@ I.acid_level = 0 I.extinguish() - /obj/machinery/shower/proc/wash_turf() if(isturf(loc)) var/turf/tile = loc @@ -336,7 +334,6 @@ if(is_cleanable(E)) qdel(E) - /obj/machinery/shower/proc/wash_mob(mob/living/L) SEND_SIGNAL(L, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK) L.wash_cream() @@ -667,11 +664,9 @@ /obj/structure/sink/puddle/deconstruct(disassembled = TRUE) qdel(src) - //Shower Curtains// //Defines used are pre-existing in layers.dm// - /obj/structure/curtain name = "curtain" desc = "Contains less than 1% mercury." @@ -727,7 +722,6 @@ return TRUE - /obj/structure/curtain/attack_hand(mob/user) . = ..() if(.) From def93f14fbd8750a654698a3ba0eb5a54bb3e41a Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 7 Apr 2020 03:40:00 -0400 Subject: [PATCH 4/6] Update watercloset.dm --- code/game/objects/structures/watercloset.dm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 81034248ec..57721ee9ca 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -12,13 +12,11 @@ var/w_items = 0 //the combined w_class of all the items in the cistern var/mob/living/swirlie = null //the mob being given a swirlie - /obj/structure/toilet/Initialize() . = ..() open = round(rand(0, 1)) update_icon() - /obj/structure/toilet/attack_hand(mob/living/user) . = ..() if(.) @@ -120,6 +118,12 @@ w_items += secret.w_class contents += secret +/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 @@ -194,7 +198,6 @@ exposed = !exposed return TRUE - /obj/item/reagent_containers/food/urinalcake name = "urinal cake" desc = "The noble urinal cake, protecting the station's pipes from the station's pee. Do not eat." @@ -278,7 +281,6 @@ add_hiddenprint(user) return TRUE - /obj/machinery/shower/update_overlays() . = ..() if(on) @@ -315,7 +317,6 @@ else if(isobj(AM)) wash_obj(AM) - /obj/machinery/shower/proc/wash_obj(obj/O) . = SEND_SIGNAL(O, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK) . = O.clean_blood() @@ -325,7 +326,6 @@ I.acid_level = 0 I.extinguish() - /obj/machinery/shower/proc/wash_turf() if(isturf(loc)) var/turf/tile = loc @@ -336,7 +336,6 @@ if(is_cleanable(E)) qdel(E) - /obj/machinery/shower/proc/wash_mob(mob/living/L) SEND_SIGNAL(L, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK) L.wash_cream() @@ -667,11 +666,9 @@ /obj/structure/sink/puddle/deconstruct(disassembled = TRUE) qdel(src) - //Shower Curtains// //Defines used are pre-existing in layers.dm// - /obj/structure/curtain name = "curtain" desc = "Contains less than 1% mercury." @@ -727,7 +724,6 @@ return TRUE - /obj/structure/curtain/attack_hand(mob/user) . = ..() if(.) From cb187dd9442e527883d778f1ca17217c9a18d04e Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Tue, 7 Apr 2020 07:36:20 -0400 Subject: [PATCH 5/6] corrections? --- _maps/map_files/MetaStation/MetaStation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 60ab03c402..906a156fe6 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -16890,7 +16890,7 @@ /turf/open/floor/plating, /area/maintenance/fore) "aGz" = ( -//obj/structure/toilet/secret/low_loot{ +/obj/structure/toilet/secret/low_loot{ pixel_y = 8 }, /obj/machinery/light/small{ From 05582f567f9af2d37d7910de923718043d9330ba Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Tue, 7 Apr 2020 09:11:20 -0400 Subject: [PATCH 6/6] ? --- code/game/objects/structures/watercloset.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 4fa1c31297..892d85cd6e 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -113,7 +113,6 @@ if (secret_type) secret = new secret_type(src) secret.desc += "" //In case you want to add something to the item that spawns - w_items += secret.w_class contents += secret /obj/structure/toilet/secret/low_loot