Ports the TG globals controller and converts globals. (#18057)

* SDQL2 update

* fix that verb

* cl

* fix that

* toworld

* this is pointless

* update info

* siiiiick..

* vv edit update

* fix that

* fix editing vars

* fix VV

* Port the /TG/ globals controller.

* part 1

* part 2

* oops

* part 3

* Hollow Purple

* sadas

* bsbsdb

* muda na agaki ta

* ids 1-15

* 16-31

* 41-75

* bring me back to how things used to be before i lost it all

* the strength of mayhem

* final touches

* cl

* protect some vars

* update sdql2 to use glob

* stuff?

* forgot that is not defined there

* whoops

* observ

* but it never gets better

* a

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2023-12-26 01:16:02 +00:00
committed by GitHub
co-authored by Matt Atlas
parent 19292f01d3
commit cadd19beac
966 changed files with 4785 additions and 4784 deletions
@@ -26,7 +26,7 @@
/obj/structure/barricade/plasteel/update_icon()
..()
if(linked)
for(var/direction in cardinal)
for(var/direction in GLOB.cardinal)
for(var/obj/structure/barricade/plasteel/cade in get_step(src, direction))
if(((dir & (NORTH|SOUTH) && get_dir(src, cade) & (EAST|WEST)) || (dir & (EAST|WEST) && get_dir(src, cade) & (NORTH|SOUTH))) && dir == cade.dir && cade.linked && cade.closed == src.closed && hasconnectionoverlay)
if(closed)
@@ -103,7 +103,7 @@
to_chat(user, SPAN_WARNING("The [src] has no linking points."))
return
linked = !linked
for(var/direction in cardinal)
for(var/direction in GLOB.cardinal)
for(var/obj/structure/barricade/plasteel/cade in get_step(src, direction))
cade.update_icon()
update_icon()
@@ -198,7 +198,7 @@
closed = 0
density = 1
if(linked)
for(var/direction in cardinal)
for(var/direction in GLOB.cardinal)
for(var/obj/structure/barricade/plasteel/cade in get_step(src, direction))
if(((dir & (NORTH|SOUTH) && get_dir(src, cade) & (EAST|WEST)) || (dir & (EAST|WEST) && get_dir(src, cade) & (NORTH|SOUTH))) && dir == cade.dir && cade != origin && cade.linked)
cade.open(src)
@@ -211,7 +211,7 @@
closed = 1
density = 0
if(linked)
for(var/direction in cardinal)
for(var/direction in GLOB.cardinal)
for(var/obj/structure/barricade/plasteel/cade in get_step(src, direction))
if(((dir & (NORTH|SOUTH) && get_dir(src, cade) & (EAST|WEST)) || (dir & (EAST|WEST) && get_dir(src, cade) & (NORTH|SOUTH))) && dir == cade.dir && cade != origin && cade.linked)
cade.close(src)
+2 -2
View File
@@ -3,7 +3,7 @@
icon_state = "Off"
layer = 2.99
anchored = TRUE
req_access = list(access_bar) //Has to initalize at first, this is updated by instance's req_access
req_access = list(ACCESS_BAR) //Has to initalize at first, this is updated by instance's req_access
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
var/cult = 0
var/choice_types = /singleton/sign/double/bar
@@ -48,7 +48,7 @@
/obj/structure/sign/double/barsign/kitchensign
icon = 'icons/obj/kitchensigns.dmi'
icon_state = "Off"
req_access = list(access_kitchen)
req_access = list(ACCESS_KITCHEN)
choice_types = /singleton/sign/double/kitchen
/obj/structure/sign/double/barsign/kitchensign/mirrored // Visible from the other end of the sign.
+6 -6
View File
@@ -1,6 +1,6 @@
#define MAX_ACTIVE_BONFIRE_LIMIT 15
var/global/list/total_active_bonfires = list()
GLOBAL_LIST_EMPTY(total_active_bonfires)
/obj/structure/bonfire
name = "bonfire"
@@ -29,7 +29,7 @@ var/global/list/total_active_bonfires = list()
/obj/structure/bonfire/Destroy()
STOP_PROCESSING(SSprocessing, src)
total_active_bonfires -= src
GLOB.total_active_bonfires -= src
. = ..()
/obj/structure/bonfire/examine(mob/user, distance, is_adjacent)
@@ -113,7 +113,7 @@ var/global/list/total_active_bonfires = list()
if(!fuel)
to_chat(user, SPAN_WARNING("There is not enough fuel to start a fire."))
return
if(total_active_bonfires.len >= MAX_ACTIVE_BONFIRE_LIMIT)
if(GLOB.total_active_bonfires.len >= MAX_ACTIVE_BONFIRE_LIMIT)
to_chat(user, SPAN_WARNING("\The [src] refuses to light, despite all your efforts."))
return
if(!on_fire)
@@ -121,7 +121,7 @@ var/global/list/total_active_bonfires = list()
check_light()
update_icon()
START_PROCESSING(SSprocessing, src)
total_active_bonfires += src
GLOB.total_active_bonfires += src
/obj/structure/bonfire/proc/check_light()
if(on_fire)
@@ -223,7 +223,7 @@ var/global/list/total_active_bonfires = list()
STOP_PROCESSING(SSprocessing, src)
check_light()
update_icon()
total_active_bonfires -= src
GLOB.total_active_bonfires -= src
if(burn_out)
visible_message(SPAN_NOTICE("\The [src] burns out, turning to a pile of ash and burnt wood."))
new /obj/effect/decal/cleanable/ash(get_turf(src))
@@ -333,7 +333,7 @@ var/global/list/total_active_bonfires = list()
check_light()
update_icon()
START_PROCESSING(SSprocessing, src)
total_active_bonfires += src
GLOB.total_active_bonfires += src
/obj/structure/bonfire/fireplace
name = "fireplace"
@@ -9,7 +9,7 @@
/obj/structure/closet/secure_closet/cabinet/bar
name = "booze closet"
req_access = list(access_bar)
req_access = list(ACCESS_BAR)
storage_capacity = 45 //such a big closet deserves a little more capacity
/obj/structure/closet/secure_closet/cabinet/bar/fill()
@@ -8,7 +8,7 @@
icon_state = "ce"
anchored = TRUE
canbemoved = TRUE
req_access = list(access_ce)
req_access = list(ACCESS_CE)
/obj/structure/closet/secure_closet/engineering_chief/fill()
new /obj/item/storage/backpack/satchel/locker_clothing/ce(src)
@@ -56,7 +56,7 @@
// Engineer
/obj/structure/closet/secure_closet/engineering_personal
name = "engineer's locker"
req_access = list(access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
icon_state = "eng_secure"
/obj/structure/closet/secure_closet/engineering_personal/fill()
@@ -84,7 +84,7 @@
// Atmospherics Technician
/obj/structure/closet/secure_closet/atmos_personal
name = "atmospheric technician's locker"
req_access = list(access_atmospherics)
req_access = list(ACCESS_ATMOSPHERICS)
icon_state = "atmos"
/obj/structure/closet/secure_closet/atmos_personal/fill()
@@ -117,7 +117,7 @@
// Electrical Supplies
/obj/structure/closet/secure_closet/engineering_electrical
name = "electrical supplies"
req_access = list(access_engine_equip)
req_access = list(ACCESS_ENGINE_EQUIP)
icon_state = "eng"
icon_door = "eng_elec"
@@ -146,7 +146,7 @@
// Welding Supplies
/obj/structure/closet/secure_closet/engineering_welding
name = "welding supplies"
req_access = list(access_construction)
req_access = list(ACCESS_CONSTRUCTION)
icon_state = "eng"
icon_door = "eng_weld"
@@ -59,7 +59,7 @@
/obj/structure/closet/secure_closet/freezer/kitchen
name = "kitchen cabinet"
desc = "A cabinet."
req_access = list(access_kitchen)
req_access = list(ACCESS_KITCHEN)
/obj/structure/closet/secure_closet/freezer/kitchen/fill()
for(var/i = 0, i < 2, i++)
@@ -73,7 +73,7 @@
/obj/structure/closet/secure_closet/freezer/money
name = "freezer"
desc = "This contains cold hard cash."
req_access = list(access_heads_vault)
req_access = list(ACCESS_HEADS_VAULT)
/obj/structure/closet/secure_closet/freezer/money/fill()
..()
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/guncabinet
name = "gun cabinet"
req_access = list(access_armory)
req_access = list(ACCESS_ARMORY)
icon = 'icons/obj/guncabinet.dmi'
icon_state = "base"
anchored = TRUE
@@ -44,7 +44,7 @@
/obj/structure/closet/secure_closet/guncabinet/sci
name = "science gun cabinet"
req_access = list(access_tox_storage)
req_access = list(ACCESS_TOX_STORAGE)
icon_state = "sci"
/obj/structure/closet/secure_closet/guncabinet/peac
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/hydroponics
name = "botanist's locker"
req_access = list(access_hydroponics)
req_access = list(ACCESS_HYDROPONICS)
icon_state = "hydro"
/obj/structure/closet/secure_closet/hydroponics/fill()
@@ -23,7 +23,7 @@
/obj/structure/closet/secure_closet/xenobotany
name = "xenobotanist's locker"
req_access = list(access_xenobotany)
req_access = list(ACCESS_XENOBOTANY)
icon_state = "xenobot"
/obj/structure/closet/secure_closet/xenobotany/fill()
@@ -2,7 +2,7 @@
name = "medicine closet"
desc = "Filled with medical junk."
icon_state = "med"
req_access = list(access_medical_equip)
req_access = list(ACCESS_MEDICAL_EQUIP)
/obj/structure/closet/secure_closet/medical1/fill()
..()
@@ -20,7 +20,7 @@
name = "anesthetics closet"
desc = "Used to knock people out."
icon_state = "med"
req_access = list(access_surgery)
req_access = list(ACCESS_SURGERY)
/obj/structure/closet/secure_closet/medical2/fill()
new /obj/item/tank/anesthetic(src)
@@ -33,7 +33,7 @@
/obj/structure/closet/secure_closet/medical3
name = "medical equipment locker"
req_access = list(access_medical_equip)
req_access = list(ACCESS_MEDICAL_EQUIP)
icon_state = "med"
/obj/structure/closet/secure_closet/medical3/fill()
@@ -78,7 +78,7 @@
/obj/structure/closet/secure_closet/medical_fr
name = "first responder's locker"
desc = "An immobile, card-locked storage unit containing all the necessary equipment for a first responder."
req_access = list(access_first_responder)
req_access = list(ACCESS_FIRST_RESPONDER)
icon_state = "med"
/obj/structure/closet/secure_closet/medical_fr/fill()
@@ -113,7 +113,7 @@
/obj/structure/closet/secure_closet/CMO
name = "chief medical officer's locker"
req_access = list(access_cmo)
req_access = list(ACCESS_CMO)
icon_state = "cmo"
/obj/structure/closet/secure_closet/CMO/fill()
@@ -142,7 +142,7 @@
/obj/structure/closet/secure_closet/CMO2
name = "chief medical officer's attire"
req_access = list(access_cmo)
req_access = list(ACCESS_CMO)
icon_state = "cmo"
/obj/structure/closet/secure_closet/CMO2/fill()
@@ -163,7 +163,7 @@
/obj/structure/closet/secure_closet/animal
name = "animal control closet"
req_access = list(access_surgery)
req_access = list(ACCESS_SURGERY)
/obj/structure/closet/secure_closet/animal/fill()
..()
@@ -177,7 +177,7 @@
desc = "Contains equipment useful to chemists."
icon_state = "med"
icon_door = "chemical"
req_access = list(access_pharmacy)
req_access = list(ACCESS_PHARMACY)
/obj/structure/closet/secure_closet/chemical/fill()
..()
@@ -199,7 +199,7 @@
name = "psychiatric supplies locker"
desc = "A psychiatric supplies locker."
icon_state = "med"
req_access = list(access_psychiatrist)
req_access = list(ACCESS_PSYCHIATRIST)
/obj/structure/closet/secure_closet/psychiatric/fill()
..()
@@ -6,7 +6,7 @@
/obj/structure/closet/secure_closet/operations_manager
name = "operations manager's locker"
icon_state = "om"
req_access = list(access_qm)
req_access = list(ACCESS_QM)
/obj/structure/closet/secure_closet/operations_manager/fill()
new /obj/item/clothing/under/rank/operations_manager(src)
@@ -34,7 +34,7 @@
/obj/structure/closet/secure_closet/hangar_tech
name = "hangar technician's locker"
icon_state = "hangar_tech"
req_access = list(access_cargo)
req_access = list(ACCESS_CARGO)
/obj/structure/closet/secure_closet/hangar_tech/fill()
..()
@@ -54,7 +54,7 @@
/obj/structure/closet/secure_closet/machinist
name = "machinist's locker"
icon_state = "machinist"
req_access = list(access_robotics)
req_access = list(ACCESS_ROBOTICS)
/obj/structure/closet/secure_closet/machinist/fill()
..()
@@ -76,7 +76,7 @@
/obj/structure/closet/secure_closet/miner
name = "miner's locker"
icon_state = "miner"
req_access = list(access_mining)
req_access = list(ACCESS_MINING)
/obj/structure/closet/secure_closet/miner/fill()
..()
@@ -106,13 +106,13 @@
// Merchant
/obj/structure/closet/secure_closet/merchant
name = "merchant's locker"
req_access = list(access_merchant)
req_access = list(ACCESS_MERCHANT)
// Package Courier
/obj/structure/closet/secure_closet/package_courier
name = "courier's locker"
icon_state = "hangar_tech"
req_access = list(access_cargo)
req_access = list(ACCESS_CARGO)
/obj/structure/closet/secure_closet/package_courier/fill()
..()
@@ -1,7 +1,7 @@
/obj/structure/closet/secure_closet/personal
name = "personal closet"
desc = "It's a secure locker for personnel. The first card swiped gains control."
req_access = list(access_all_personal_lockers)
req_access = list(ACCESS_ALL_PERSONAL_LOCKERS)
var/registered_name = null
/obj/structure/closet/secure_closet/personal/fill()
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/scientist
name = "scientist's locker"
req_access = list(access_tox_storage)
req_access = list(ACCESS_TOX_STORAGE)
icon_state = "science"
/obj/structure/closet/secure_closet/scientist/fill()
@@ -15,7 +15,7 @@
/obj/structure/closet/secure_closet/RD
name = "research director's locker"
req_access = list(access_rd)
req_access = list(ACCESS_RD)
icon_state = "rd"
/obj/structure/closet/secure_closet/RD/fill()
@@ -42,7 +42,7 @@
/obj/structure/closet/secure_closet/RD2
name = "research director's attire"
req_access = list(access_rd)
req_access = list(ACCESS_RD)
icon_state = "rd"
/obj/structure/closet/secure_closet/RD2/fill()
@@ -94,7 +94,7 @@
/obj/structure/closet/secure_closet/marooning_equipment
name = "marooning equipment locker"
icon_state = "maroon"
req_one_access = list(access_security, access_heads) // Marooned personnel would likely be marooned by security and/or command.
req_one_access = list(ACCESS_SECURITY, ACCESS_HEADS) // Marooned personnel would likely be marooned by security and/or command.
/obj/structure/closet/secure_closet/marooning_equipment/fill()
new /obj/item/clothing/mask/breath(src)
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/captains
name = "captain's locker"
req_access = list(access_captain)
req_access = list(ACCESS_CAPTAIN)
icon_state = "cap"
/obj/structure/closet/secure_closet/captains/fill()
@@ -28,7 +28,7 @@
/obj/structure/closet/secure_closet/captains2
name = "captain's attire"
req_access = list(access_captain)
req_access = list(ACCESS_CAPTAIN)
icon_state = "cap"
/obj/structure/closet/secure_closet/captains2/fill()
@@ -48,7 +48,7 @@
/obj/structure/closet/secure_closet/xo
name = "executive officer's locker"
req_access = list(access_hop)
req_access = list(ACCESS_HOP)
icon_state = "sec"
icon_door = "hop"
@@ -75,7 +75,7 @@
/obj/structure/closet/secure_closet/xo2
name = "executive officer's attire"
req_access = list(access_hop)
req_access = list(ACCESS_HOP)
icon_state = "sec"
icon_door = "hop"
@@ -94,7 +94,7 @@
/obj/structure/closet/secure_closet/hos
name = "head of security's locker"
req_access = list(access_hos)
req_access = list(ACCESS_HOS)
icon_state = "hos"
/obj/structure/closet/secure_closet/hos/fill()
@@ -138,7 +138,7 @@
/obj/structure/closet/secure_closet/hos2
name = "head of security's attire"
req_access = list(access_hos)
req_access = list(ACCESS_HOS)
icon_state = "hos"
/obj/structure/closet/secure_closet/hos2/fill()
@@ -163,7 +163,7 @@
/obj/structure/closet/secure_closet/warden
name = "warden's locker"
req_access = list(access_armory)
req_access = list(ACCESS_ARMORY)
icon_state = "warden"
/obj/structure/closet/secure_closet/warden/fill()
@@ -206,7 +206,7 @@
/obj/structure/closet/secure_closet/security_cadet
name = "security cadet's locker"
req_access = list(access_security)
req_access = list(ACCESS_SECURITY)
icon_state = "sec"
icon_door = "seccadet"
@@ -236,7 +236,7 @@
/obj/structure/closet/secure_closet/security
name = "security officer's locker"
req_access = list(access_brig)
req_access = list(ACCESS_BRIG)
icon_state = "sec"
/obj/structure/closet/secure_closet/security/fill()
@@ -271,7 +271,7 @@
/obj/structure/closet/secure_closet/investigator
name = "investigator's locker"
req_access = list(access_forensics_lockers)
req_access = list(ACCESS_FORENSICS_LOCKERS)
icon_state = "sec"
/obj/structure/closet/secure_closet/investigator/fill()
@@ -305,7 +305,7 @@
/obj/structure/closet/secure_closet/injection
name = "lethal injections locker"
req_access = list(access_captain)
req_access = list(ACCESS_CAPTAIN)
/obj/structure/closet/secure_closet/injection/fill()
new /obj/item/reagent_containers/syringe/large/ld50_syringe/chloral(src)
@@ -315,17 +315,17 @@
// These are special snowflakes that need to be in a global list.
/obj/structure/closet/secure_closet/brig
name = "brig locker"
req_access = list(access_brig)
req_access = list(ACCESS_BRIG)
anchored = TRUE
canbemoved = TRUE
var/id = null
/obj/structure/closet/secure_closet/brig/Initialize()
. = ..()
brig_closets += src
GLOB.brig_closets += src
/obj/structure/closet/secure_closet/brig/Destroy()
brig_closets -= src
GLOB.brig_closets -= src
return ..()
/obj/structure/closet/secure_closet/brig/fill()
@@ -334,7 +334,7 @@
/obj/structure/closet/secure_closet/courtroom
name = "courtroom locker"
req_access = list(access_lawyer)
req_access = list(ACCESS_LAWYER)
/obj/structure/closet/secure_closet/courtroom/fill()
..()
@@ -351,7 +351,7 @@
/obj/structure/closet/secure_closet/bridge_crew
name = "bridge crew's locker"
req_access = list(access_bridge_crew)
req_access = list(ACCESS_BRIDGE_CREW)
icon_state = "sec"
icon_door = "hop"
@@ -372,11 +372,11 @@
name = "evidence storage locker"
anchored = TRUE
canbemoved = TRUE
req_one_access = list(access_brig, access_armory, access_forensics_lockers)
req_one_access = list(ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS)
// Contraband Storage Locker
/obj/structure/closet/secure_closet/contraband
name = "contraband weapons and ammunition storage locker"
anchored = TRUE
canbemoved = TRUE
req_access = list(access_armory)
req_access = list(ACCESS_ARMORY)
@@ -3,7 +3,7 @@
name = "custodial closet"
desc = "It's a storage unit for a custodian's clothes and gear."
icon_state = "custodial"
req_access = list(access_janitor)
req_access = list(ACCESS_JANITOR)
/obj/structure/closet/secure_closet/custodial/fill()
new /obj/item/clothing/head/softcap/nt/custodian(src)
@@ -127,7 +127,7 @@
/obj/structure/closet/secure_closet/soll_officer
name = "sol alliance officer locker"
req_access = list(access_captain)
req_access = list(ACCESS_CAPTAIN)
icon_state = "cap"
/obj/structure/closet/secure_closet/soll_officer/fill()
@@ -86,4 +86,4 @@
icon_door_override = TRUE
locked = TRUE
secure = TRUE
req_access = list(access_medical_equip)
req_access = list(ACCESS_MEDICAL_EQUIP)
@@ -417,7 +417,7 @@
name = "AI modules crate"
desc = "A secure crate full of AI modules."
icon_state = "science_crate"
req_access = list(access_cent_specops)
req_access = list(ACCESS_CENT_SPECOPS)
/obj/structure/closet/crate/secure/aimodules/fill()
for(var/moduletype in subtypesof(/obj/item/aiModule))
@@ -446,7 +446,7 @@
name = "foreign legion supply crate"
desc = "A secure supply crate, It carries the insignia of the Tau Ceti Foreign Legion. It appears quite scuffed."
icon_state = "tcfl_crate"
req_access = list(access_legion)
req_access = list(ACCESS_LEGION)
/obj/structure/closet/crate/secure/phoron
name = "phoron crate"
@@ -464,7 +464,7 @@
name = "secure hydroponics crate"
desc = "A crate with a lock on it, painted in the scheme of the station's botanists."
icon_state = "hydro_secure_crate"
req_one_access = list(access_hydroponics, access_xenobotany)
req_one_access = list(ACCESS_HYDROPONICS, ACCESS_XENOBOTANY)
/obj/structure/closet/crate/secure/bin
name = "secure bin"
+1 -1
View File
@@ -6,7 +6,7 @@
density = TRUE
anchored = TRUE
unacidable = TRUE
req_access = list(access_captain)
req_access = list(ACCESS_CAPTAIN)
var/health = 30
var/obj/held_obj
var/open = FALSE
@@ -178,7 +178,7 @@
return
var/placement_dir = get_dir(user, A)
if (!(placement_dir in cardinal))
if (!(placement_dir in GLOB.cardinal))
to_chat(user, SPAN_WARNING("You must stand directly in front of the location you wish to place that on."))
return
@@ -61,13 +61,13 @@
new /obj/effect/decal/cleanable/blood/no_dry(loc)
START_PROCESSING(SSprocessing, src)
dirs_left = cardinal.Copy()
dirs_left = GLOB.cardinal.Copy()
/obj/structure/gore/tendrils/proc/update_neighbours(turf/U)
if(!U)
U = loc
if(istype(U))
for(var/dirn in cardinal)
for(var/dirn in GLOB.cardinal)
var/turf/T = get_step(U, dirn)
if(!istype(T))
continue
@@ -77,7 +77,7 @@
/obj/structure/gore/tendrils/proc/update_sprite()
var/my_dir = 0
for(var/check_dir in cardinal)
for(var/check_dir in GLOB.cardinal)
var/turf/check = get_step(src, check_dir)
if(!istype(check))
continue
+1 -1
View File
@@ -261,7 +261,7 @@
if(electrocute_mob(user, C, src))
if(C.powernet)
C.powernet.trigger_warning()
spark(src, 3, alldirs)
spark(src, 3, GLOB.alldirs)
if(user.stunned)
return 1
else
+2 -2
View File
@@ -74,10 +74,10 @@
/obj/structure/janitorialcart/New()
..()
janitorial_supplies |= src
GLOB.janitorial_supplies |= src
/obj/structure/janitorialcart/Destroy()
janitorial_supplies -= src
GLOB.janitorial_supplies -= src
QDEL_NULL(mybag)
QDEL_NULL(mymop)
QDEL_NULL(myspray)
+4 -4
View File
@@ -19,14 +19,14 @@
reflection.setup_visuals(src)
ref = WEAKREF(reflection)
entered_event.register(loc, reflection, TYPE_PROC_REF(/obj/effect/reflection, check_vampire_enter))
exited_event.register(loc, reflection, TYPE_PROC_REF(/obj/effect/reflection, check_vampire_exit))
GLOB.entered_event.register(loc, reflection, TYPE_PROC_REF(/obj/effect/reflection, check_vampire_enter))
GLOB.exited_event.register(loc, reflection, TYPE_PROC_REF(/obj/effect/reflection, check_vampire_exit))
/obj/structure/mirror/Destroy()
var/obj/effect/reflection/reflection = ref.resolve()
if(istype(reflection))
entered_event.unregister(loc, reflection)
exited_event.unregister(loc, reflection)
GLOB.entered_event.unregister(loc, reflection)
GLOB.exited_event.unregister(loc, reflection)
qdel(reflection)
ref = null
return ..()
+2 -2
View File
@@ -12,10 +12,10 @@
/obj/structure/mopbucket/Initialize()
. = ..()
create_reagents(bucketsize)
janitorial_supplies |= src
GLOB.janitorial_supplies |= src
/obj/structure/mopbucket/Destroy()
janitorial_supplies -= src
GLOB.janitorial_supplies -= src
return ..()
/obj/structure/mopbucket/examine(mob/user, distance, is_adjacent)
+1 -1
View File
@@ -342,7 +342,7 @@
/obj/machinery/button/switch/crematorium
name = "crematorium igniter"
desc = "Burn baby burn!"
req_access = list(access_crematorium)
req_access = list(ACCESS_CREMATORIUM)
id = 1
var/cremate_dir // something for mappers, setting will make a crematorium in one step in this direction toggle
+1 -1
View File
@@ -245,7 +245,7 @@ FLOOR SAFES
time_to_drill -= (world.time - last_drill_time) * drill.time_multiplier
last_drill_time = world.time
if(prob(15))
spark(loc, 3, alldirs)
spark(loc, 3, GLOB.alldirs)
if(time_to_drill <= 0)
drill_open()
@@ -42,7 +42,7 @@
buckled.set_dir(dir)
/obj/structure/bed/stool/chair/MouseDrop_T(mob/target, mob/user)
if(target == user && user.loc != loc && (reverse_dir[dir] & angle2dir(Get_Angle(src, user))))
if(target == user && user.loc != loc && (GLOB.reverse_dir[dir] & angle2dir(Get_Angle(src, user))))
user.visible_message("<b>[user]</b> starts climbing over the back of \the [src]...", SPAN_NOTICE("You start climbing over the back of \the [src]..."))
if(do_after(user, 2 SECONDS, do_flags = DO_UNIQUE))
user.forceMove(loc)
@@ -51,7 +51,7 @@
/obj/structure/bed/stool/chair/CanPass(atom/movable/mover, turf/target, height, air_group)
if(anchored && padding_material)
if(mover?.density && isliving(mover) && (reverse_dir[dir] & angle2dir(Get_Angle(src, mover))))
if(mover?.density && isliving(mover) && (GLOB.reverse_dir[dir] & angle2dir(Get_Angle(src, mover))))
return FALSE
return ..()
+4 -4
View File
@@ -43,8 +43,8 @@
T.pixel_x = 0
T.pixel_y = 0
T.layer = ABOVE_OBJ_LAYER
moved_event.register(T, src, TYPE_PROC_REF(/atom/movable, move_to_turf))
moved_event.register(src, T, TYPE_PROC_REF(/atom/movable, move_to_turf))
GLOB.moved_event.register(T, src, TYPE_PROC_REF(/atom/movable, move_to_turf))
GLOB.moved_event.register(src, T, TYPE_PROC_REF(/atom/movable, move_to_turf))
T.stake = src
pinned_target = T
else
@@ -52,8 +52,8 @@
if(pinned_target)
pinned_target.density = FALSE
pinned_target.layer = OBJ_LAYER
moved_event.unregister(pinned_target, src)
moved_event.unregister(src, pinned_target)
GLOB.moved_event.unregister(pinned_target, src)
GLOB.moved_event.unregister(src, pinned_target)
pinned_target.stake = null
pinned_target = null
+2 -2
View File
@@ -35,7 +35,7 @@
if(closed)
to_chat(usr, "You check your watch, realising it's closed.")
else
to_chat(usr, "You check your watch, glancing over at the watch face, reading the time to be '[worldtime2text()]'. Today's date is '[time2text(world.time, "Month DD")]. [game_year]'.")
to_chat(usr, "You check your watch, glancing over at the watch face, reading the time to be '[worldtime2text()]'. Today's date is '[time2text(world.time, "Month DD")]. [GLOB.game_year]'.")
/obj/item/pocketwatch/verb/pointatwatch()
set category = "Object"
@@ -108,7 +108,7 @@
return
if(!thrall || !thrall.resolve())
thrall = null
to_chat(user, "You decipher the watch's mesmerizing face, discerning the time to be: '[worldtime2text()]'. Today's date is '[time2text(world.time, "Month DD")]. [game_year]'.")
to_chat(user, "You decipher the watch's mesmerizing face, discerning the time to be: '[worldtime2text()]'. Today's date is '[time2text(world.time, "Month DD")]. [GLOB.game_year]'.")
return
var/mob/living/carbon/human/H = thrall.resolve()