diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm index 4b7c7a3edcd..3ac6de20314 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm @@ -4676,7 +4676,7 @@ /obj/structure/safe, /obj/effect/turf_decal/delivery/hollow, /obj/item/stack/spacecash/c500, -/obj/effect/spawner/random_spawners/ruin/deepstorage_award, +/obj/effect/spawner/random/deepstorage_award, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "vault" diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm index 7a14126f074..25369e690d5 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm @@ -76,7 +76,7 @@ /turf/simulated/wall, /area/syndicate_depot/outer) "ap" = ( -/obj/effect/spawner/random_spawners/syndicate/turret/external, +/obj/effect/spawner/random/syndicate/turret/external, /turf/simulated/floor/plating/asteroid/airless, /area/syndicate_depot/outer) "aq" = ( @@ -146,13 +146,15 @@ dir = 1; on = 1 }, -/obj/effect/spawner/random_spawners/syndicate/loot, +/obj/effect/spawner/random/syndicate/loot/common, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/syndicate_depot/core) "aB" = ( -/obj/effect/spawner/random_spawners/syndicate/loot, +/obj/effect/spawner/random/syndicate/loot/common, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -173,7 +175,7 @@ }, /area/syndicate_depot/core) "aE" = ( -/obj/effect/spawner/random_spawners/syndicate/layout/door, +/obj/effect/spawner/random/syndicate/walldoor, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -202,7 +204,7 @@ /area/syndicate_depot/core) "aJ" = ( /obj/machinery/light, -/obj/effect/spawner/random_spawners/syndicate/turret, +/obj/effect/spawner/random/syndicate/turret, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -221,7 +223,7 @@ }, /area/syndicate_depot/core) "aM" = ( -/obj/effect/spawner/random_spawners/syndicate/turret/external, +/obj/effect/spawner/random/syndicate/turret/external, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -235,7 +237,7 @@ }, /area/syndicate_depot/core) "aO" = ( -/obj/effect/spawner/random_spawners/syndicate/trap/mine, +/obj/effect/spawner/random/syndicate/mine, /obj/item/stack/sheet/metal{ layer = 4.1 }, @@ -306,7 +308,7 @@ dir = 1; on = 1 }, -/obj/effect/spawner/random_spawners/syndicate/turret, +/obj/effect/spawner/random/syndicate/turret, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -330,19 +332,20 @@ }, /area/syndicate_depot/core) "ba" = ( -/obj/effect/spawner/random_spawners/syndicate/trap/medbot, +/obj/effect/spawner/random/syndicate/medbot, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/syndicate_depot/core) "bb" = ( -/obj/effect/spawner/random_spawners/syndicate/mob, +/obj/effect/spawner/random/syndicate/mob, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/syndicate_depot/core) "bc" = ( -/obj/effect/spawner/random_spawners/syndicate/loot/level2, +/obj/effect/spawner/random/syndicate/loot/rare, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -350,7 +353,7 @@ "bd" = ( /obj/item/lighter/zippo/black, /obj/structure/table, -/obj/effect/spawner/random_spawners/syndicate/loot/stetchkin, +/obj/effect/spawner/random/syndicate/loot/stetchkin, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -367,7 +370,8 @@ dir = 1; on = 1 }, -/obj/effect/spawner/random_spawners/syndicate/loot/level2, +/obj/effect/spawner/random/syndicate/loot/rare, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -394,7 +398,7 @@ /area/syndicate_depot/outer) "bl" = ( /obj/structure/table, -/obj/effect/spawner/random_spawners/syndicate/loot/stetchkin, +/obj/effect/spawner/random/syndicate/loot/stetchkin, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -413,7 +417,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/spawner/random_spawners/syndicate/loot, +/obj/effect/spawner/random/syndicate/loot/common, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -422,7 +427,8 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/spawner/random_spawners/syndicate/loot, +/obj/effect/spawner/random/syndicate/loot/common, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -458,7 +464,7 @@ /turf/simulated/floor/plating, /area/syndicate_depot/outer) "bs" = ( -/obj/effect/spawner/random_spawners/syndicate/turret, +/obj/effect/spawner/random/syndicate/turret, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -474,7 +480,7 @@ }, /area/syndicate_depot/core) "bv" = ( -/obj/effect/spawner/random_spawners/syndicate/turret, +/obj/effect/spawner/random/syndicate/turret, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -532,7 +538,8 @@ }, /area/syndicate_depot/core) "bE" = ( -/obj/effect/spawner/random_spawners/syndicate/loot/level3, +/obj/effect/spawner/random/syndicate/loot/officer, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -571,7 +578,7 @@ /area/syndicate_depot/outer) "bJ" = ( /obj/structure/closet/secure_closet/syndicate/depot, -/obj/effect/spawner/random_spawners/syndicate/trap/documents, +/obj/effect/spawner/random/syndicate/trapped_documents, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -621,7 +628,7 @@ /area/syndicate_depot/core) "bP" = ( /obj/structure/table, -/obj/effect/spawner/random_spawners/syndicate/trap/pizzabomb, +/obj/effect/spawner/random/syndicate/pizzabomb, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -657,7 +664,7 @@ /area/syndicate_depot/outer) "bU" = ( /obj/structure/table, -/obj/effect/spawner/random_spawners/syndicate/loot/stetchkin, +/obj/effect/spawner/random/syndicate/loot/stetchkin, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -692,7 +699,7 @@ /turf/simulated/wall/mineral/plastitanium/nodiagonal, /area/syndicate_depot/core) "bZ" = ( -/obj/effect/spawner/random_spawners/syndicate/layout/door/vault, +/obj/effect/spawner/random/syndicate/wallvault, /obj/effect/landmark{ dir = 4; name = "syndi_depot_shield" @@ -725,7 +732,7 @@ /turf/simulated/wall/mineral/plastitanium/nodiagonal, /area/syndicate_depot/core) "cd" = ( -/obj/effect/spawner/random_spawners/syndicate/mob, +/obj/effect/spawner/random/syndicate/mob, /turf/simulated/floor/mineral/silver, /area/syndicate_depot/core) "ce" = ( @@ -792,7 +799,8 @@ }, /area/syndicate_depot/core) "cm" = ( -/obj/effect/spawner/random_spawners/syndicate/loot/level4, +/obj/effect/spawner/random/syndicate/loot/armory, +/obj/structure/closet/secure_closet/syndicate/depot/armory, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -803,13 +811,15 @@ dir = 1; on = 1 }, -/obj/effect/spawner/random_spawners/syndicate/loot/level4, +/obj/effect/spawner/random/syndicate/loot/armory, +/obj/structure/closet/secure_closet/syndicate/depot/armory, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/syndicate_depot/core) "co" = ( -/obj/effect/spawner/random_spawners/syndicate/loot/level4, +/obj/effect/spawner/random/syndicate/loot/armory, +/obj/structure/closet/secure_closet/syndicate/depot/armory, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -884,7 +894,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/effect/spawner/random_spawners/syndicate/layout/door/vault, +/obj/effect/spawner/random/syndicate/wallvault, /obj/effect/landmark{ name = "syndi_depot_shield" }, @@ -998,7 +1008,7 @@ }, /area/syndicate_depot/core) "cL" = ( -/obj/effect/spawner/random_spawners/syndicate/layout/door/vault, +/obj/effect/spawner/random/syndicate/wallvault, /obj/effect/landmark{ name = "syndi_depot_shield" }, @@ -1058,7 +1068,7 @@ dir = 1; on = 1 }, -/obj/effect/spawner/random_spawners/syndicate/turret, +/obj/effect/spawner/random/syndicate/turret, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -1118,7 +1128,8 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/spawner/random_spawners/syndicate/loot/level2, +/obj/effect/spawner/random/syndicate/loot/rare, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -1145,7 +1156,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/spawner/random_spawners/syndicate/turret, +/obj/effect/spawner/random/syndicate/turret, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/code/game/objects/effects/spawners/depot_spawners.dm b/code/game/objects/effects/spawners/depot_spawners.dm index ac489f588c2..49742158d15 100644 --- a/code/game/objects/effects/spawners/depot_spawners.dm +++ b/code/game/objects/effects/spawners/depot_spawners.dm @@ -1,184 +1,189 @@ /// Spawners for the Syndicate depot ruin. -/obj/effect/spawner/random_spawners/syndicate +/obj/effect/spawner/random/syndicate + name = "Syndicate Area Spawner" + icon = 'icons/effects/random_spawners.dmi' // Turrets -/obj/effect/spawner/random_spawners/syndicate/turret - name = "50pc int turret" - icon_state = "x" - result = list(/datum/nothing = 1, - /obj/machinery/porta_turret/syndicate/interior = 1) +/obj/effect/spawner/random/syndicate/turret + name = "50pc interior turret" + icon_state = "turret" + loot = list(/obj/machinery/porta_turret/syndicate/interior) + spawn_loot_chance = 50 -/obj/effect/spawner/random_spawners/syndicate/turret/external - name = "50pc ext turret" - result = list(/datum/nothing = 1, - /obj/machinery/porta_turret/syndicate/exterior = 1) +/obj/effect/spawner/random/syndicate/turret/external + name = "50pc exterior turret" + loot = list(/obj/machinery/porta_turret/syndicate/exterior) // Mobs -/obj/effect/spawner/random_spawners/syndicate/mob +/obj/effect/spawner/random/syndicate/mob name = "50pc melee syndimob" - icon_state = "x" - color = "#333333" - result = list(/datum/nothing = 1, - /mob/living/simple_animal/hostile/syndicate/melee/autogib/depot = 1) + icon = 'icons/effects/spawner_icons.dmi' + icon_state = "syndie_depot" + loot = list(/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot) + spawn_loot_chance = 50 + +/obj/effect/spawner/random/syndicate/medbot + name = "50pc trap medibot" + icon = 'icons/effects/spawner_icons.dmi' + icon_state = "syndie_medbot" + loot = list(/mob/living/simple_animal/bot/medbot/syndicate/emagged) + spawn_loot_chance = 50 // Traps -/obj/effect/spawner/random_spawners/syndicate/trap - icon_state = "x" - color = "#000000" - -/obj/effect/spawner/random_spawners/syndicate/trap/pizzabomb +/obj/effect/spawner/random/syndicate/pizzabomb name = "33pc trap pizza" - result = list(/obj/item/pizzabox/meat = 1, + icon_state = "pizzabox" + loot = list( + /obj/item/pizzabox/pepperoni = 7, // Higher weight as a pizza bomb looks like pepperoni by default + /obj/item/pizzabox/pizza_bomb/autoarm = 7, + /obj/item/pizzabox/firecracker = 1, + /obj/item/pizzabox/garlic = 1, /obj/item/pizzabox/hawaiian = 1, /obj/item/pizzabox/margherita = 1, - /obj/item/pizzabox/vegetable = 1, + /obj/item/pizzabox/meat = 1, /obj/item/pizzabox/mushroom = 1, - /obj/item/pizzabox/pepperoni = 7, //Higher weight as a pizza bomb looks like pepperoni by default - /obj/item/pizzabox/garlic = 1, - /obj/item/pizzabox/firecracker = 1, - /obj/item/pizzabox/pizza_bomb/autoarm = 7) - -/obj/effect/spawner/random_spawners/syndicate/trap/medbot - name = "50pc trap medibot" - result = list(/datum/nothing = 1, - /mob/living/simple_animal/bot/medbot/syndicate/emagged = 1) - -/obj/effect/spawner/random_spawners/syndicate/trap/mine - name = "50pc trap landmine" - result = list(/datum/nothing = 1, - /obj/effect/mine/depot = 1) - -/obj/effect/spawner/random_spawners/syndicate/trap/documents - name = "66pc trapped documents" - result = list(/obj/item/documents/syndicate/yellow = 1, - /obj/item/documents/syndicate/yellow/trapped = 1) - + /obj/item/pizzabox/vegetable = 1, + ) +/obj/effect/spawner/random/syndicate/mine + name = "50pc landmine" + icon_state = "mine" + loot = list(/obj/effect/mine/depot) + spawn_loot_chance = 50 + layer = POINT_LAYER +/obj/effect/spawner/random/syndicate/trapped_documents + name = "50pc trapped documents" + icon_state = "folder" + loot = list( + /obj/item/documents/syndicate/yellow, + /obj/item/documents/syndicate/yellow/trapped, + ) // Loot - -/obj/effect/spawner/random_spawners/syndicate/loot - name = "common loot" - icon_state = "x3" - spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot +/obj/effect/spawner/random/syndicate/loot/common + name = "syndicate depot loot, common" + icon_state = "loot" + spawn_loot_chance = 50 // Loot schema: costumes, toys, useless gimmick items - result = list(/datum/nothing = 13, - /obj/item/storage/toolbox/syndicate = 1, - /obj/item/storage/fancy/cigarettes/cigpack_syndicate = 1, - /obj/item/deck/cards/syndicate = 1, - /obj/item/storage/secure/briefcase/syndie = 1, - /obj/item/toy/syndicateballoon = 1, - /obj/item/soap/syndie = 1, - /obj/item/clothing/under/syndicate = 1, - /obj/item/clothing/mask/gas/syndicate = 1, - /obj/item/suppressor = 1, - /obj/item/coin/antagtoken/syndicate = 1, - /obj/item/storage/box/syndie_kit/space = 1, - /obj/item/clothing/shoes/magboots/syndie = 1) + loot = list( + /obj/item/clothing/mask/gas/syndicate, + /obj/item/clothing/shoes/magboots/syndie, + /obj/item/clothing/under/syndicate, + /obj/item/coin/antagtoken/syndicate, + /obj/item/deck/cards/syndicate, + /obj/item/soap/syndie, + /obj/item/storage/box/syndie_kit/space, + /obj/item/storage/fancy/cigarettes/cigpack_syndicate, + /obj/item/storage/secure/briefcase/syndie, + /obj/item/storage/toolbox/syndicate, + /obj/item/suppressor, + /obj/item/toy/syndicateballoon, + ) -/obj/effect/spawner/random_spawners/syndicate/loot/stetchkin - name = "20pc stetchkin" - icon_state = "x3" - spawn_inside = null - result = list(/datum/nothing = 1, - /obj/item/wrench = 1, - /obj/item/food/syndicake = 1, - /obj/item/coin/antagtoken/syndicate = 1, - /obj/item/gun/projectile/automatic/pistol = 1) +/obj/effect/spawner/random/syndicate/loot/stetchkin + name = "syndicate depot loot, 20pct stetchkin" + icon_state = "stetchkin" + spawn_loot_chance = 80 + loot = list( + /obj/item/gun/projectile/automatic/pistol, + /obj/item/coin/antagtoken/syndicate, + /obj/item/food/syndicake, + /obj/item/wrench, + ) -/obj/effect/spawner/random_spawners/syndicate/loot/level2 - name = "rare loot" +/obj/effect/spawner/random/syndicate/loot/rare + name = "syndicate depot loot, rare" + icon_state = "doubleloot" + spawn_loot_chance = 50 // Basic stealth, utility and environmental gear. - result = list(/datum/nothing = 27, - /obj/item/mod/control/pre_equipped/traitor = 1, - /obj/item/ammo_box/magazine/m10mm = 1, - /obj/item/storage/backpack/duffel/syndie/med/surgery = 1, - /obj/item/clothing/shoes/chameleon/noslip = 1, - /obj/item/storage/belt/military = 1, - /obj/item/clothing/under/chameleon = 1, - /obj/item/storage/backpack/satchel_flat = 1, - /obj/item/stamp/chameleon = 1, - /obj/item/lighter/zippo/gonzofist = 1, - /obj/item/stack/sheet/mineral/plasma{amount = 20} = 1, - /obj/item/stack/sheet/mineral/silver{amount = 20} = 1, - /obj/item/stack/sheet/mineral/gold{amount = 20} = 1, - /obj/item/stack/sheet/mineral/uranium{amount = 20} = 1, - /obj/item/mod/module/noslip = 1, - /obj/item/mod/module/visor/night = 1, - /obj/item/clothing/gloves/color/black/thief = 1, - /obj/item/clothing/suit/storage/iaa/blackjacket/armored = 1, - /obj/item/clothing/suit/jacket/bomber/syndicate = 1, - /obj/item/mod/module/holster/hidden = 1, - /obj/item/storage/firstaid/tactical = 1, - /obj/item/clothing/under/syndicate/silicon_cham = 1, - /obj/item/storage/box/syndie_kit/camera_bug = 1, - /obj/item/gun/projectile/automatic/toy/pistol/riot = 1, - /obj/item/flash/cameraflash = 1, - /obj/item/mod/module/chameleon = 1, - /obj/item/reagent_containers/hypospray/autoinjector/nanocalcium = 1) + loot = list( + /obj/item/ammo_box/magazine/m10mm, + /obj/item/clothing/gloves/color/black/thief, + /obj/item/clothing/shoes/chameleon/noslip, + /obj/item/clothing/suit/jacket/bomber/syndicate, + /obj/item/clothing/suit/storage/iaa/blackjacket/armored, + /obj/item/clothing/under/chameleon, + /obj/item/clothing/under/syndicate/silicon_cham, + /obj/item/flash/cameraflash, + /obj/item/gun/projectile/automatic/toy/pistol/riot, + /obj/item/lighter/zippo/gonzofist, + /obj/item/mod/control/pre_equipped/traitor, + /obj/item/mod/module/chameleon, + /obj/item/mod/module/holster/hidden, + /obj/item/mod/module/noslip, + /obj/item/mod/module/visor/night, + /obj/item/reagent_containers/hypospray/autoinjector/nanocalcium, + /obj/item/stack/sheet/mineral/gold{amount = 20}, + /obj/item/stack/sheet/mineral/plasma{amount = 20}, + /obj/item/stack/sheet/mineral/silver{amount = 20}, + /obj/item/stack/sheet/mineral/uranium{amount = 20}, + /obj/item/stamp/chameleon, + /obj/item/storage/backpack/duffel/syndie/med/surgery, + /obj/item/storage/backpack/satchel_flat, + /obj/item/storage/belt/military, + /obj/item/storage/box/syndie_kit/camera_bug, + /obj/item/storage/firstaid/tactical, + ) -/obj/effect/spawner/random_spawners/syndicate/loot/level3 - name = "officer loot" +/obj/effect/spawner/random/syndicate/loot/officer + name = "syndicate depot loot, officer" + spawn_loot_chance = 40 // Primarily utility items with occasional low damage weaponry. - result = list(/datum/nothing = 25, - /obj/item/jammer = 1, - /obj/item/encryptionkey/binary = 1, - /obj/item/pinpointer/advpinpointer = 1, - /obj/item/borg/upgrade/syndicate = 1, - /obj/item/borg/upgrade/selfrepair = 1, - /obj/item/storage/box/syndie_kit/stechkin = 1, - /obj/item/stack/sheet/mineral/diamond{amount = 10} = 1, - /obj/item/stack/sheet/mineral/uranium{amount = 10} = 1, - /obj/item/clothing/shoes/magboots/elite = 1, - /obj/item/clothing/glasses/hud/security/chameleon = 1, - /obj/item/mod/module/visor/thermal = 1, - /obj/item/mod/module/stealth = 1, - /obj/item/mod/module/power_kick = 1, - /obj/item/storage/box/syndidonkpockets = 1, - /obj/item/pen/edagger = 1, - /obj/item/door_remote/omni/access_tuner = 1, - /obj/item/clothing/glasses/thermal = 1) + loot = list( + /obj/item/borg/upgrade/selfrepair, + /obj/item/borg/upgrade/syndicate, + /obj/item/clothing/glasses/hud/security/chameleon, + /obj/item/clothing/glasses/thermal, + /obj/item/clothing/shoes/magboots/elite, + /obj/item/door_remote/omni/access_tuner, + /obj/item/encryptionkey/binary, + /obj/item/jammer, + /obj/item/mod/module/power_kick, + /obj/item/mod/module/stealth, + /obj/item/mod/module/visor/thermal, + /obj/item/pen/edagger, + /obj/item/pinpointer/advpinpointer, + /obj/item/stack/sheet/mineral/diamond{amount = 10}, + /obj/item/stack/sheet/mineral/uranium{amount = 10}, + /obj/item/storage/box/syndidonkpockets, + /obj/item/storage/box/syndie_kit/stechkin, + ) - -/obj/effect/spawner/random_spawners/syndicate/loot/level4 - name = "armory loot" - spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot/armory +/obj/effect/spawner/random/syndicate/loot/armory + name = "syndicate depot loot, armory" // Combat orientated items that could give the player an advantage if an antag messes with them. - result = list(/obj/item/melee/energy/sword/saber = 1, - /obj/item/autosurgeon/organ/syndicate/oneuse/razorwire = 1, - /obj/item/chameleon = 1, - /obj/item/CQC_manual = 1, - /obj/item/reagent_containers/hypospray/autoinjector/stimulants = 1, - /obj/item/clothing/gloves/fingerless/rapid = 1, - /obj/item/gun/medbeam = 1, - /obj/item/shield/energy = 1, - /obj/item/storage/box/syndie_kit/teleporter = 1, - /obj/item/weaponcrafting/gunkit/universal_gun_kit = 1) - + loot = list( + /obj/item/autosurgeon/organ/syndicate/oneuse/razorwire, + /obj/item/chameleon, + /obj/item/clothing/gloves/fingerless/rapid, + /obj/item/CQC_manual, + /obj/item/gun/medbeam, + /obj/item/melee/energy/sword/saber, + /obj/item/reagent_containers/hypospray/autoinjector/stimulants, + /obj/item/shield/energy, + /obj/item/storage/box/syndie_kit/teleporter, + /obj/item/weaponcrafting/gunkit/universal_gun_kit, + ) // Layout-affecting spawns -/obj/effect/spawner/random_spawners/syndicate/layout - icon_state = "x2" - -/obj/effect/spawner/random_spawners/syndicate/layout/door +/obj/effect/spawner/random/syndicate/walldoor name = "50pc door 25pc falsewall 25pc wall" - result = list(/obj/machinery/door/airlock/hatch/syndicate = 6, + icon_state = "walldoor" + loot = list( + /obj/machinery/door/airlock/hatch/syndicate = 6, /turf/simulated/wall/mineral/plastitanium/nodiagonal = 2, - /obj/structure/falsewall/plastitanium = 2) + /obj/structure/falsewall/plastitanium = 2, + ) -/obj/effect/spawner/random_spawners/syndicate/layout/door/vault +/obj/effect/spawner/random/syndicate/wallvault name = "80pc vaultdoor 20pc wall" - result = list(/obj/machinery/door/airlock/hatch/syndicate/vault = 4, - /turf/simulated/wall/mineral/plastitanium/nodiagonal = 1) - -/obj/effect/spawner/random_spawners/ruin/deepstorage_award - name = "boss award" - result = list(/obj/item/storage/belt/champion/wrestling = 1, - /obj/item/storage/box/telescience = 1, - /obj/item/storage/box/syndie_kit/chameleon = 3, - /obj/item/rod_of_asclepius = 3) + icon_state = "wallvault" + loot = list( + /obj/machinery/door/airlock/hatch/syndicate/vault = 4, + /turf/simulated/wall/mineral/plastitanium/nodiagonal = 1, + ) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index d7a6d873f14..4a0e7885729 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -2,6 +2,7 @@ name = "web" desc = "it's stringy and sticky" icon = 'icons/effects/effects.dmi' + icon_state = "stickyweb1" anchored = TRUE density = FALSE max_integrity = 15 diff --git a/code/modules/awaymissions/mission_code/ruins/deepstorage.dm b/code/modules/awaymissions/mission_code/ruins/deepstorage.dm index 17494928b3f..dfb0931dbe0 100644 --- a/code/modules/awaymissions/mission_code/ruins/deepstorage.dm +++ b/code/modules/awaymissions/mission_code/ruins/deepstorage.dm @@ -376,5 +376,15 @@ name = "attention" info = {"As per administration's order, unauthorized entry to supply storage is forbidden. Make your requests from the guard wing if you have a pending delivery."} +/obj/effect/spawner/random/deepstorage_award + name = "boss award" + icon_state = "questionmark" + loot = list( + /obj/item/rod_of_asclepius = 3, + /obj/item/storage/box/syndie_kit/chameleon = 3, + /obj/item/storage/belt/champion/wrestling = 1, + /obj/item/storage/box/telescience = 1, + ) + #undef DS_BOSS_STORAGE #undef DS_ENGINEERING diff --git a/icons/effects/random_spawners.dmi b/icons/effects/random_spawners.dmi index 77aa8915532..325fb1ae5e0 100644 Binary files a/icons/effects/random_spawners.dmi and b/icons/effects/random_spawners.dmi differ diff --git a/icons/effects/spawner_icons.dmi b/icons/effects/spawner_icons.dmi index 3e70b0af400..1b9730e5379 100644 Binary files a/icons/effects/spawner_icons.dmi and b/icons/effects/spawner_icons.dmi differ diff --git a/tools/UpdatePaths/Scripts/26861_syndie_depot_spawners.txt b/tools/UpdatePaths/Scripts/26861_syndie_depot_spawners.txt new file mode 100644 index 00000000000..b42b0e888ee --- /dev/null +++ b/tools/UpdatePaths/Scripts/26861_syndie_depot_spawners.txt @@ -0,0 +1,16 @@ +/obj/effect/spawner/random_spawners/ruin/deepstorage_award : /obj/effect/spawner/random/deepstorage_award + +/obj/effect/spawner/random_spawners/syndicate/layout/door : /obj/effect/spawner/random/syndicate/walldoor +/obj/effect/spawner/random_spawners/syndicate/layout/door/vault : /obj/effect/spawner/random/syndicate/wallvault +/obj/effect/spawner/random_spawners/syndicate/loot : /obj/effect/spawner/random/syndicate/loot/common, /obj/structure/closet/secure_closet/syndicate/depot +/obj/effect/spawner/random_spawners/syndicate/loot/level2 : /obj/effect/spawner/random/syndicate/loot/rare, /obj/structure/closet/secure_closet/syndicate/depot +/obj/effect/spawner/random_spawners/syndicate/loot/level3 : /obj/effect/spawner/random/syndicate/loot/officer, /obj/structure/closet/secure_closet/syndicate/depot +/obj/effect/spawner/random_spawners/syndicate/loot/level4 : /obj/effect/spawner/random/syndicate/loot/armory, /obj/structure/closet/secure_closet/syndicate/depot/armory +/obj/effect/spawner/random_spawners/syndicate/loot/stetchkin : /obj/effect/spawner/random/syndicate/loot/stetchkin +/obj/effect/spawner/random_spawners/syndicate/mob : /obj/effect/spawner/random/syndicate/mob +/obj/effect/spawner/random_spawners/syndicate/trap/documents : /obj/effect/spawner/random/syndicate/trapped_documents +/obj/effect/spawner/random_spawners/syndicate/trap/medbot : /obj/effect/spawner/random/syndicate/medbot +/obj/effect/spawner/random_spawners/syndicate/trap/mine : /obj/effect/spawner/random/syndicate/mine +/obj/effect/spawner/random_spawners/syndicate/trap/pizzabomb : /obj/effect/spawner/random/syndicate/pizzabomb +/obj/effect/spawner/random_spawners/syndicate/turret : /obj/effect/spawner/random/syndicate/turret +/obj/effect/spawner/random_spawners/syndicate/turret/external : /obj/effect/spawner/random/syndicate/turret/external