mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 04:26:03 +01:00
Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-24-10a
This commit is contained in:
@@ -160,6 +160,8 @@
|
||||
l_pocket = /obj/item/uplink/nuclear
|
||||
r_pocket = /obj/item/modular_computer/pda/nukeops
|
||||
|
||||
skillchips = list(/obj/item/skillchip/disk_verifier)
|
||||
|
||||
/obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser/captain
|
||||
name = "Syndicate Battlecruiser Captain"
|
||||
you_are_text = "You are the captain aboard the syndicate flagship: the SBC Starfury."
|
||||
|
||||
@@ -38,6 +38,12 @@
|
||||
if(faction)
|
||||
faction = string_list(faction)
|
||||
|
||||
/obj/effect/mob_spawn/Destroy()
|
||||
spawned_mob_ref = null
|
||||
if(istype(outfit))
|
||||
QDEL_NULL(outfit)
|
||||
return ..()
|
||||
|
||||
/// Creates whatever mob the spawner makes. Return FALSE if we want to exit from here without doing that, returning NULL will be logged to admins.
|
||||
/obj/effect/mob_spawn/proc/create(mob/mob_possessor, newname)
|
||||
var/mob/living/spawned_mob = new mob_type(get_turf(src)) //living mobs only
|
||||
@@ -137,7 +143,7 @@
|
||||
SSpoints_of_interest.make_point_of_interest(src)
|
||||
LAZYADD(GLOB.mob_spawners[name], src)
|
||||
|
||||
/obj/effect/mob_spawn/Destroy()
|
||||
/obj/effect/mob_spawn/ghost_role/Destroy()
|
||||
var/list/spawners = GLOB.mob_spawners[name]
|
||||
LAZYREMOVE(spawners, src)
|
||||
if(!LAZYLEN(spawners))
|
||||
@@ -275,6 +281,7 @@
|
||||
|
||||
///these mob spawn subtypes trigger immediately (New or Initialize) and are not player controlled... since they're dead, you know?
|
||||
/obj/effect/mob_spawn/corpse
|
||||
density = FALSE //these are pretty much abstract objects that leave a corpse in their place.
|
||||
///when this mob spawn should auto trigger.
|
||||
var/spawn_when = CORPSE_INSTANT
|
||||
|
||||
|
||||
Reference in New Issue
Block a user