mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-29 23:17:28 +01:00
Ghost Busting (#18854)
* bustin makes me feel good * Update vorestation.dme * Update trap.dm * more * Edits * Make this work on incorp entities * Update entrepreneur_items.dm * Ghost Capture! * awwa * Update entrepreneur_items.dm * Update entrepreneur_items.dm * vore * Other ways to spawn it * Spectral shot * ammo * yeh * get these * Update ammo.dm * AAAA * Update weapons.dm * Update weapons.dm * beeem * better * Update weapons.dm * more stuffs * make sure this is unticked * Update supplypack.dm * spooky * yeh * mob sprites * aaa * Update research_nodes.dm * Remove RND_CATEGORY_INITIAL from ammunition designs * ?. * subtype
This commit is contained in:
@@ -69,7 +69,6 @@
|
||||
/obj/item/personal_shield_generator/loaded //starts with a cell
|
||||
bcell = /obj/item/cell/device/shield_generator/backpack
|
||||
|
||||
|
||||
/obj/item/personal_shield_generator/update_icon()
|
||||
if(shield_active)
|
||||
icon_state = "shieldpack_basic_on"
|
||||
|
||||
@@ -75,6 +75,10 @@
|
||||
name = "entertainment intercom"
|
||||
frequency = ENT_FREQ
|
||||
|
||||
/obj/item/radio/intercom/science
|
||||
name = "station intercom (Science)"
|
||||
channels=list("Science")
|
||||
|
||||
/obj/item/radio/intercom/omni
|
||||
name = "global announcer"
|
||||
/obj/item/radio/intercom/omni/Initialize(mapload)
|
||||
|
||||
@@ -298,7 +298,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
|
||||
if(!GLOB.autospeaker)
|
||||
return
|
||||
var/datum/radio_frequency/connection = null
|
||||
if(channel && channels && channels.len > 0)
|
||||
if(channel && channels && LAZYLEN(channels))
|
||||
if(channel == "department")
|
||||
channel = channels[1]
|
||||
connection = secure_radio_connections[channel]
|
||||
@@ -325,7 +325,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
|
||||
return radio_connection
|
||||
|
||||
// Otherwise, if a channel is specified, look for it.
|
||||
if(channels && channels.len > 0)
|
||||
if(channels && LAZYLEN(channels))
|
||||
if (message_mode == "department") // Department radio shortcut
|
||||
message_mode = channels[1]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user