mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 19:47:22 +01:00
Fix: Syndie depot locker is only spawned when there is a loot (#26979)
* 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:
co-authored by
warriorstar-orion
parent
dab6fc5504
commit
854a1606da
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user