cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-14 00:26:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

next set of globals (#19131)

Browse Source
This commit is contained in:
Kashargul
2026-02-09 00:36:52 +01:00
committed by GitHub
parent bc0df9f988
commit fa113ea3f5
101 changed files with 473 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/observer/observer.dm
+2 -2
View File
@@ -246,8 +246,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/observer/dead/get_status_tab_items()
. = ..()
if(emergency_shuttle)
var/eta_status = emergency_shuttle.get_status_panel_eta()
if(GLOB.emergency_shuttle)
var/eta_status = GLOB.emergency_shuttle.get_status_panel_eta()
if(eta_status)
. += ""
. += "[eta_status]"
code/modules/mob/living/carbon/alien/diona/diona.dm
+3 -3
View File
@@ -1,4 +1,4 @@
var/list/_nymph_default_emotes = list(
GLOBAL_LIST_INIT(nymph_default_emotes, list(
/decl/emote/visible,
/decl/emote/visible/scratch,
/decl/emote/visible/drool,
@@ -22,7 +22,7 @@ var/list/_nymph_default_emotes = list(
/decl/emote/audible/bug_hiss,
/decl/emote/audible/bug_chitter,
/decl/emote/audible/chirp
)
))
/mob/living/carbon/alien/diona
name = "diona nymph"
@@ -47,7 +47,7 @@ var/list/_nymph_default_emotes = list(
var/obj/item/hat
/mob/living/carbon/alien/diona/get_available_emotes()
return global._nymph_default_emotes.Copy()
return GLOB.nymph_default_emotes.Copy()
/mob/living/carbon/alien/diona/Initialize(mapload)
. = ..()
code/modules/mob/living/carbon/alien/emote.dm
+3 -3
View File
@@ -1,4 +1,4 @@
var/list/_alien_default_emotes = list(
GLOBAL_LIST_INIT(alien_default_emotes, list(
/decl/emote/visible,
/decl/emote/visible/scratch,
/decl/emote/visible/drool,
@@ -25,7 +25,7 @@ var/list/_alien_default_emotes = list(
/decl/emote/audible/moan,
/decl/emote/audible/gnarl,
/decl/emote/audible/chirp
)
))
/mob/living/carbon/alien/get_available_emotes()
. = global._alien_default_emotes.Copy()
. = GLOB.alien_default_emotes.Copy()
code/modules/mob/living/carbon/brain/emote.dm
+3 -3
View File
@@ -1,4 +1,4 @@
var/list/_brain_default_emotes = list(
GLOBAL_LIST_INIT(brain_default_emotes, list(
/decl/emote/audible/alarm,
/decl/emote/audible/alert,
/decl/emote/audible/notice,
@@ -8,10 +8,10 @@ var/list/_brain_default_emotes = list(
/decl/emote/audible/boop,
/decl/emote/visible/blink,
/decl/emote/visible/flash
)
))
/mob/living/carbon/brain/can_emote()
return (istype(container, /obj/item/mmi) && ..())
/mob/living/carbon/brain/get_available_emotes()
return global._brain_default_emotes.Copy()
return GLOB.brain_default_emotes.Copy()
code/modules/mob/living/carbon/human/emote.dm
+6 -14
View File
@@ -1,4 +1,4 @@
var/list/_human_default_emotes = list(
GLOBAL_LIST_INIT(human_default_emotes, list(
/decl/emote/visible/blink,
/decl/emote/audible/synth,
/decl/emote/audible/synth/beep,
@@ -99,7 +99,6 @@ var/list/_human_default_emotes = list(
/decl/emote/visible/vomit,
/decl/emote/visible/floorspin,
/decl/emote/visible/flip,
//VOREStation Add
/decl/emote/audible/bug_hiss,
/decl/emote/audible/bug_buzz,
/decl/emote/audible/bug_chitter,
@@ -181,14 +180,9 @@ var/list/_human_default_emotes = list(
/decl/emote/audible/caw2,
/decl/emote/audible/caw_m,
/decl/emote/audible/gwah
))
//VOREStation Add End
)
//VOREStation Add Start
var/list/_simple_mob_default_emotes = list(
GLOBAL_LIST_INIT(simple_mob_default_emotes, list(
/decl/emote/visible/blink,
/decl/emote/visible/nod,
/decl/emote/visible/shake,
@@ -331,17 +325,15 @@ var/list/_simple_mob_default_emotes = list(
/decl/emote/audible/caw2,
/decl/emote/audible/caw_m,
/decl/emote/audible/gwah
)
//VOREStation Add End
))
/mob/living/carbon/human/get_available_emotes()
. = global._human_default_emotes.Copy()
. = GLOB.human_default_emotes.Copy()
if(length(species?.default_emotes))
return . | species.default_emotes
/mob/living/simple_mob/get_available_emotes()
. = global._simple_mob_default_emotes.Copy()
. = GLOB.simple_mob_default_emotes.Copy()
/mob/living/carbon/human/verb/pose()
set name = "Set Pose"
code/modules/mob/living/carbon/human/human.dm
+2 -2
View File
@@ -100,8 +100,8 @@
. += ""
. += "Intent: [a_intent]"
. += "Move Mode: [m_intent]"
if(emergency_shuttle)
var/eta_status = emergency_shuttle.get_status_panel_eta()
if(GLOB.emergency_shuttle)
var/eta_status = GLOB.emergency_shuttle.get_status_panel_eta()
if(eta_status)
. += "[eta_status]"
code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm
+2 -2
View File
@@ -188,8 +188,8 @@
return TRUE // yup
/mob/living/simple_mob/protean_blob/get_available_emotes()
var/list/fulllist = global._robot_default_emotes.Copy()
fulllist |= global._human_default_emotes //they're living nanites, they can make whatever sounds they want
var/list/fulllist = GLOB.robot_default_emotes.Copy()
fulllist |= GLOB.human_default_emotes //they're living nanites, they can make whatever sounds they want
return fulllist
/mob/living/simple_mob/protean_blob/update_misc_tabs()
code/modules/mob/living/silicon/ai/ai.dm
+2 -2
View File
@@ -406,7 +406,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
call_shuttle_proc(src)
// hack to display shuttle timer
if(emergency_shuttle.online())
if(GLOB.emergency_shuttle.online())
post_status(src, "shuttle", user = src)
/mob/living/silicon/ai/proc/ai_recall_shuttle()
@@ -559,7 +559,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
for (var/obj/machinery/camera/C in cameranet.cameras)
if(!C.can_use())
continue
var/list/tempnetwork = difflist(C.network,restricted_camera_networks,1)
var/list/tempnetwork = difflist(C.network, GLOB.restricted_camera_networks, 1)
for(var/i in tempnetwork)
cameralist[i] = i
code/modules/mob/living/silicon/emote.dm
+6 -6
View File
@@ -1,4 +1,4 @@
var/list/_silicon_default_emotes = list(
GLOBAL_LIST_INIT(silicon_default_emotes, list(
/decl/emote/audible/synth,
/decl/emote/audible/synth/beep,
/decl/emote/audible/synth/bing,
@@ -13,15 +13,15 @@ var/list/_silicon_default_emotes = list(
/decl/emote/audible/synth/microwave,
/decl/emote/audible/synth/security,
/decl/emote/audible/synth/security/halt
)
))
/mob/living/silicon/get_available_emotes()
return global._silicon_default_emotes.Copy()
return GLOB.silicon_default_emotes.Copy()
/mob/living/silicon/pai/get_available_emotes()
var/list/fulllist = list()
fulllist |= _silicon_default_emotes
fulllist |= _robot_default_emotes
fulllist |= _human_default_emotes
fulllist |= GLOB.silicon_default_emotes
fulllist |= GLOB.robot_default_emotes
fulllist |= GLOB.human_default_emotes
return fulllist
code/modules/mob/living/silicon/robot/emote.dm
+4 -6
View File
@@ -1,4 +1,4 @@
var/list/_robot_default_emotes = list(
GLOBAL_LIST_INIT(robot_default_emotes, list(
/decl/emote/audible/clap,
/decl/emote/visible/bow,
/decl/emote/visible/salute,
@@ -29,13 +29,11 @@ var/list/_robot_default_emotes = list(
/decl/emote/audible/synth/microwave,
/decl/emote/audible/synth/security,
/decl/emote/audible/synth/security/halt,
//VOREStation Add
/decl/emote/visible/mlem,
/decl/emote/visible/blep
//VOREStation Add End
)
))
/mob/living/silicon/robot/get_available_emotes()
var/list/fulllist = global._robot_default_emotes.Copy()
fulllist |= _human_default_emotes
var/list/fulllist = GLOB.robot_default_emotes.Copy()
fulllist |= GLOB.human_default_emotes
return fulllist
code/modules/mob/living/silicon/silicon.dm
+2 -2
View File
@@ -155,8 +155,8 @@
// this function displays the shuttles ETA in the status panel if the shuttle has been called
/mob/living/silicon/proc/show_emergency_shuttle_eta()
if(emergency_shuttle)
var/eta_status = emergency_shuttle.get_status_panel_eta()
if(GLOB.emergency_shuttle)
var/eta_status = GLOB.emergency_shuttle.get_status_panel_eta()
if(eta_status)
. = "[eta_status]"
code/modules/mob/living/simple_mob/subtypes/animal/alien animals/synx.dm
+1 -1
View File
@@ -151,7 +151,7 @@
/mob/living/simple_mob/animal/synx/get_available_emotes()
. = ..()
. |= _human_default_emotes //Synx are great at mimicking
. |= GLOB.human_default_emotes //Synx are great at mimicking
/mob/living/simple_mob/animal/synx/ai //AI controlled variant
code/modules/mob/living/simple_mob/subtypes/vore/shadekin/types.dm
+1 -1
View File
@@ -316,7 +316,7 @@
comp.dark_energy_infinite = TRUE
/mob/living/simple_mob/shadekin/red/rakshasa/get_available_emotes()
. = global._simple_mob_default_emotes.Copy()
. = GLOB.simple_mob_default_emotes.Copy()
. += /decl/emote/audible/evil_laugh
. += /decl/emote/audible/evil_no
. += /decl/emote/audible/evil_breathing