cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 22:47:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Syndie depot locker is only spawned when there is a loot (#26979)

Browse Source 
* fixing depot

* Update code/game/objects/effects/spawners/random/random_spawner.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>

---------

Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
This commit is contained in:
kyunkyunkyun
2024-10-06 09:28:07 +00:00
committed by GitHub
co-authored by warriorstar-orion
parent dab6fc5504
commit 854a1606da
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm
-12
View File
@@ -147,14 +147,12 @@
on = 1
},
/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/syndicate/loot/common,
/obj/structure/closet/secure_closet/syndicate/depot,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -345,7 +343,6 @@
/area/syndicate_depot/core)
"bc" = (
/obj/effect/spawner/random/syndicate/loot/rare,
/obj/structure/closet/secure_closet/syndicate/depot,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -371,7 +368,6 @@
on = 1
},
/obj/effect/spawner/random/syndicate/loot/rare,
/obj/structure/closet/secure_closet/syndicate/depot,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -418,7 +414,6 @@
dir = 8
},
/obj/effect/spawner/random/syndicate/loot/common,
/obj/structure/closet/secure_closet/syndicate/depot,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -428,7 +423,6 @@
dir = 4
},
/obj/effect/spawner/random/syndicate/loot/common,
/obj/structure/closet/secure_closet/syndicate/depot,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -539,7 +533,6 @@
/area/syndicate_depot/core)
"bE" = (
/obj/effect/spawner/random/syndicate/loot/officer,
/obj/structure/closet/secure_closet/syndicate/depot,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -577,7 +570,6 @@
},
/area/syndicate_depot/outer)
"bJ" = (
/obj/structure/closet/secure_closet/syndicate/depot,
/obj/effect/spawner/random/syndicate/trapped_documents,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -800,7 +792,6 @@
/area/syndicate_depot/core)
"cm" = (
/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"
@@ -812,14 +803,12 @@
on = 1
},
/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/syndicate/loot/armory,
/obj/structure/closet/secure_closet/syndicate/depot/armory,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -1129,7 +1118,6 @@
dir = 8
},
/obj/effect/spawner/random/syndicate/loot/rare,
/obj/structure/closet/secure_closet/syndicate/depot,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
code/game/objects/effects/spawners/depot_spawners.dm
+6
View File
@@ -58,12 +58,16 @@
/obj/effect/spawner/random/syndicate/trapped_documents
name = "50pc trapped documents"
icon_state = "folder"
spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot
loot = list(
/obj/item/documents/syndicate/yellow,
/obj/item/documents/syndicate/yellow/trapped,
)
// Loot
/obj/effect/spawner/random/syndicate/loot
spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot
/obj/effect/spawner/random/syndicate/loot/common
name = "syndicate depot loot, common"
icon_state = "loot"
@@ -87,6 +91,7 @@
/obj/effect/spawner/random/syndicate/loot/stetchkin
name = "syndicate depot loot, 20pct stetchkin"
icon_state = "stetchkin"
spawn_inside = null
spawn_loot_chance = 80
loot = list(
/obj/item/gun/projectile/automatic/pistol,
@@ -155,6 +160,7 @@
/obj/effect/spawner/random/syndicate/loot/armory
name = "syndicate depot loot, armory"
spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot/armory
// Combat orientated items that could give the player an advantage if an antag messes with them.
loot = list(
/obj/item/autosurgeon/organ/syndicate/oneuse/razorwire,
code/game/objects/effects/spawners/random/random_spawner.dm
+5
View File
@@ -35,6 +35,8 @@
var/spawn_random_angle = FALSE
/// Whether blackbox should record when the spawner spawns.
var/record_spawn = FALSE
/// Where do we want to spawn an item (closet, safe etc.)
var/spawn_inside
// Brief explanation:
// Rather then setting up and then deleting spawners, we block all atomlike setup
@@ -57,6 +59,9 @@
var/list/spawn_locations = get_spawn_locations(spawn_scatter_radius)
var/spawn_loot_count = isnull(lootcount_override) ? src.spawn_loot_count : lootcount_override
if(spawn_inside)
new spawn_inside(loc)
if(spawn_all_loot)
spawn_loot_count = INFINITY
spawn_loot_double = FALSE