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

bunch of global vars (#19091)

Browse Source 
* bunch of global vars

* .
This commit is contained in:
Kashargul
2026-01-25 22:18:03 +01:00
committed by GitHub
parent 2f810d0f3e
commit de17517e42
92 changed files with 328 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/antag_spawners.dm
+2 -2
View File
@@ -84,7 +84,7 @@
to_chat(H, span_infoplain(span_bold("It would be wise to speak to your master, and learn what their plans are for today.")))
spawn(1)
technomancers.add_antagonist(H.mind, 0, 1, 0, 0, 0)
GLOB.technomancers.add_antagonist(H.mind, 0, 1, 0, 0, 0)
equip_antag(H)
used = 1
qdel(src)
@@ -133,7 +133,7 @@
R.key = C.key
spawn(1)
mercs.add_antagonist(R.mind, FALSE, TRUE, FALSE, FALSE, FALSE)
GLOB.mercs.add_antagonist(R.mind, FALSE, TRUE, FALSE, FALSE, FALSE)
//add_antagonist(var/datum/mind/player, var/ignore_role, var/do_not_equip, var/move_to_spawn, var/do_not_announce, var/preserve_appearance)
qdel(src)
code/game/objects/items/devices/radio/intercom.dm
+1 -1
View File
@@ -170,7 +170,7 @@
return -1
if (!src.listening)
return -1
if(freq in ANTAG_FREQS)
if(freq in GLOB.antag_frequencies)
if(!(src.syndie))
return -1//Prevents broadcast of messages over devices lacking the encryption
code/game/objects/items/devices/radio/radio.dm
+2 -2
View File
@@ -560,10 +560,10 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
var/pos_z = get_z(src)
if(!(pos_z in level))
return -1
if(freq in ANTAG_FREQS)
if(freq in GLOB.antag_frequencies)
if(!(src.syndie))//Checks to see if it's allowed on that frequency, based on the encryption keys
return -1
if(freq in CENT_FREQS)
if(freq in GLOB.cent_frequencies)
if(!(src.centComm))//Checks to see if it's allowed on that frequency, based on the encryption keys
return -1
if (!on)
code/game/objects/items/stacks/medical.dm
+8 -8
View File
@@ -242,20 +242,20 @@
var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
if(affecting.open)
balloon_alert(user, "the [affecting.name] is cut open!")
user.balloon_alert(user, "the [affecting.name] is cut open!")
return
if(affecting.is_salved())
balloon_alert(user, "the wounds on [M]'s [affecting.name] have already been salved.")
user.balloon_alert(user, "the wounds on [M]'s [affecting.name] have already been salved.")
return 1
else
user.balloon_alert_visible("\the [user] starts salving wounds on [M]'s [affecting.name].", \
"salving the wounds on [M]'s [affecting.name]." )
if(!do_after(user, 1 SECOND, affecting))
balloon_alert(user, "stand still to salve wounds.")
user.balloon_alert(user, "stand still to salve wounds.")
return 1
if(affecting.is_salved()) // We do a second check after the delay, in case it was bandaged after the first check.
balloon_alert(user, "[M]'s [affecting.name] have already been salved.")
user.balloon_alert(user, "[M]'s [affecting.name] have already been salved.")
return 1
user.balloon_alert_visible("[user] salved wounds on [M]'s [affecting.name].", \
"salved wounds on [M]'s [affecting.name]." )
@@ -357,19 +357,19 @@
var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
if(affecting.open)
balloon_alert(user, "the [affecting.name] is cut open!")
user.balloon_alert(user, "the [affecting.name] is cut open!")
if(affecting.is_salved())
balloon_alert(user, "[M]'s [affecting.name] has already been salved.")
user.balloon_alert(user, "[M]'s [affecting.name] has already been salved.")
return 1
else
user.balloon_alert_visible("\the [user] starts salving wounds on [M]'s [affecting.name].", \
"salving the wounds on [M]'s [affecting.name]." )
if(!do_after(user, 1 SECOND, affecting))
balloon_alert(user, "stand still to salve wounds.")
user.balloon_alert(user, "stand still to salve wounds.")
return 1
if(affecting.is_salved()) // We do a second check after the delay, in case it was bandaged after the first check.
balloon_alert(user, "[M]'s [affecting.name] have already been salved.")
user.balloon_alert(user, "[M]'s [affecting.name] have already been salved.")
return 1
user.balloon_alert_visible("[user] covers wounds on [M]'s [affecting.name] with regenerative membrane.", \
"covered wounds on [M]'s [affecting.name] with regenerative membrane." )
code/game/objects/items/weapons/id cards/id_stacks.dm
+5 -5
View File
@@ -29,23 +29,23 @@
//ERT
/obj/item/card/id/centcom/ERT
/obj/item/card/id/centcom/ert
name = "Emergency Responder ID"
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-red", "stripe-red")
/obj/item/card/id/centcom/ERT/medic
/obj/item/card/id/centcom/ert/medic
name = "Emergency Medical Responder ID"
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-medblu", "stripe-medblu")
/obj/item/card/id/centcom/ERT/commander
/obj/item/card/id/centcom/ert/commander
name = "Emergency Response Commander ID"
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-gold", "stripe-gold")
/obj/item/card/id/centcom/ERT/engineer
/obj/item/card/id/centcom/ert/engineer
name = "Emergency Engineering Responder ID"
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-orange", "stripe-orange")
/obj/item/card/id/centcom/ERT/janitor
/obj/item/card/id/centcom/ert/janitor
name = "Emergency Cleanup Responder ID"
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-purple", "stripe-purple")
code/game/objects/items/weapons/id cards/station_ids.dm
+2 -2
View File
@@ -220,13 +220,13 @@
. = ..()
access |= get_all_station_access()
/obj/item/card/id/centcom/ERT
/obj/item/card/id/centcom/ert
name = "\improper " + JOB_EMERGENCY_RESPONSE_TEAM + "ID"
assignment = JOB_EMERGENCY_RESPONSE_TEAM
icon_state = "ert-id"
rank = JOB_EMERGENCY_RESPONSE_TEAM
/obj/item/card/id/centcom/ERT/Initialize(mapload)
/obj/item/card/id/centcom/ert/Initialize(mapload)
. = ..()
access |= get_all_station_access()
code/game/objects/items/weapons/scrolls.dm
+1 -1
View File
@@ -18,7 +18,7 @@
. = ..(user)
if(.)
return TRUE
if((user.mind && !wizards.is_antagonist(user.mind)))
if((user.mind && !GLOB.wizards.is_antagonist(user.mind)))
to_chat(user, span_warning("You stare at the scroll but cannot make sense of the markings!"))
return
code/game/objects/objs.dm
+2 -2
View File
@@ -168,10 +168,10 @@
overlays.Remove(blood_overlay)
if(gurgled && clean_types & CLEAN_WASH)
gurgled = FALSE
cut_overlay(gurgled_overlays[gurgled_color])
cut_overlay(GLOB.gurgled_overlays[gurgled_color])
if(contaminated && clean_types & CLEAN_RAD) // Phoron and stuff, washing machine needed
contaminated = FALSE
cut_overlay(contamination_overlay)
cut_overlay(GLOB.contamination_overlay)
/obj/vv_get_dropdown()
. = ..()
code/game/objects/structures/mirror.dm
+2 -2
View File
@@ -135,7 +135,7 @@
if(choice && choice == "Yes")
var/mob/living/carbon/human/vox/vox = new(get_turf(src),SPECIES_VOX)
vox.gender = user.gender
raiders.equip(vox)
GLOB.raiders.equip(vox)
if(user.mind)
user.mind.transfer_to(vox)
spawn(1)
@@ -145,6 +145,6 @@
newname = L.get_random_name()
vox.real_name = newname
vox.name = vox.real_name
raiders.update_access(vox)
GLOB.raiders.update_access(vox)
qdel(user)
..()