From e41ddf4e2b6cb28421e382d5da5dc7d9f4e86afb Mon Sep 17 00:00:00 2001 From: ariaworld <143797359+ariaworld@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:08:38 +0200 Subject: [PATCH] Ze update... --- .../maint/10x5/10x5_ratburger.dmm | 2 +- .../game/objects/effects/spawners/lootdrop.dm | 81 +++++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-) diff --git a/_maps/RandomRuins/StationRuins/maint/10x5/10x5_ratburger.dmm b/_maps/RandomRuins/StationRuins/maint/10x5/10x5_ratburger.dmm index bdd5210c54..728d2168e5 100644 --- a/_maps/RandomRuins/StationRuins/maint/10x5/10x5_ratburger.dmm +++ b/_maps/RandomRuins/StationRuins/maint/10x5/10x5_ratburger.dmm @@ -165,7 +165,7 @@ /turf/open/floor/plasteel/cafeteria, /area/template_noop) "N" = ( -/obj/machinery/barsign{ +/obj/structure/sign/barsign{ pixel_y = 32 }, /turf/open/floor/plating, diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index bd47acd965..edd299d44a 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -134,6 +134,87 @@ /obj/item/trash/sosjerky = 1, /obj/item/trash/syndi_cakes = 1) +/obj/effect/spawner/lootdrop/trashbin + name = "trash spawner" + loot = list(/obj/item/cigbutt = 1, + /obj/item/trash/cheesie = 1, + /obj/item/trash/candy = 1, + /obj/item/trash/chips = 1, + /obj/item/reagent_containers/food/snacks/deadmouse = 1, + /obj/item/trash/pistachios = 1, + /obj/item/trash/plate = 1, + /obj/item/trash/popcorn = 1, + /obj/item/trash/raisins = 1, + /obj/item/trash/sosjerky = 1, + /obj/item/reagent_containers/food/snacks/grown/poppy = 1, + /obj/item/trash/syndi_cakes = 1, + /obj/item/broken_bottle = 1) + +/obj/effect/spawner/lootdrop/tanks + name = "reagent tank spawner" + icon_state = "random_tanks" + lootdoubles = FALSE + + loot = list( + /obj/structure/reagent_dispensers/fueltank = 5, + /obj/structure/reagent_dispensers/watertank = 5, + /obj/structure/reagent_dispensers/watertank/high = 3, + /obj/structure/reagent_dispensers/foamtank = 1, + ) + +/obj/effect/spawner/lootdrop/tanks/lowchance + name = "rare reagent tank spawner" + lootdoubles = FALSE + + loot = list( + "" = 50, + /obj/structure/reagent_dispensers/fueltank = 5, + /obj/structure/reagent_dispensers/watertank = 5, + /obj/structure/reagent_dispensers/watertank/high = 3, + /obj/structure/reagent_dispensers/foamtank = 1, + ) + +/obj/effect/spawner/lootdrop/tanks/midchance + name = "common reagent tank spawner" + lootdoubles = FALSE + + loot = list( + "" = 15, + /obj/structure/reagent_dispensers/fueltank = 5, + /obj/structure/reagent_dispensers/watertank = 5, + /obj/structure/reagent_dispensers/watertank/high = 3, + /obj/structure/reagent_dispensers/foamtank = 1, + ) + +/obj/effect/spawner/lootdrop/tanks/highchance + name = "frequent reagent tank spawner" + lootdoubles = FALSE + + loot = list( + "" = 5, + /obj/structure/reagent_dispensers/fueltank = 5, + /obj/structure/reagent_dispensers/watertank = 5, + /obj/structure/reagent_dispensers/watertank/high = 3, + /obj/structure/reagent_dispensers/foamtank = 1, + ) + +/obj/effect/spawner/lootdrop/tanks/highquality + name = "highcap water/foam tank spawner" + lootdoubles = FALSE + + loot = list( + /obj/structure/reagent_dispensers/watertank/high = 5, + /obj/structure/reagent_dispensers/foamtank = 5, + ) + +/obj/effect/spawner/lootdrop/tanks/fuelonly + name = "guaranteed fuel tank spawner" + lootdoubles = FALSE + + loot = list( + /obj/structure/reagent_dispensers/fueltank = 5, + ) + /obj/effect/spawner/lootdrop/three_course_meal name = "three course meal spawner" lootcount = 3