cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 19:13:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes all global variables handled by the GLOB controller (#13152)

Browse Source 
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
This commit is contained in:
AffectedArc07
2020-03-21 03:56:37 +00:00
committed by GitHub
parent c8dbd0190e
commit 210f8badf4
667 changed files with 4243 additions and 4240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/anomalies.dm
+1 -1
View File
@@ -26,7 +26,7 @@
/obj/effect/anomaly/proc/anomalyEffect()
if(prob(50))
step(src,pick(alldirs))
step(src,pick(GLOB.alldirs))
/obj/effect/anomaly/proc/anomalyNeutralize()
code/game/objects/effects/bump_teleporter.dm
+4 -4
View File
@@ -1,4 +1,4 @@
var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
GLOBAL_LIST_EMPTY(bump_teleporters)
/obj/effect/bump_teleporter
name = "bump-teleporter"
@@ -13,10 +13,10 @@ var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
/obj/effect/bump_teleporter/New()
..()
BUMP_TELEPORTERS += src
GLOB.bump_teleporters += src
/obj/effect/bump_teleporter/Destroy()
BUMP_TELEPORTERS -= src
GLOB.bump_teleporters -= src
return ..()
/obj/effect/bump_teleporter/singularity_act()
@@ -34,7 +34,7 @@ var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
//user.loc = src.loc //Stop at teleporter location, there is nowhere to teleport to.
return
for(var/obj/effect/bump_teleporter/BT in BUMP_TELEPORTERS)
for(var/obj/effect/bump_teleporter/BT in GLOB.bump_teleporters)
if(BT.id == src.id_target)
usr.loc = BT.loc //Teleport to location with correct id.
return
code/game/objects/effects/decals/Cleanable/fuel.dm
+1 -1
View File
@@ -26,7 +26,7 @@
var/turf/simulated/S = loc
if(!istype(S))
return
for(var/d in cardinal)
for(var/d in GLOB.cardinal)
if(rand(25))
var/turf/simulated/target = get_step(src, d)
var/turf/simulated/origin = get_turf(src)
code/game/objects/effects/decals/Cleanable/humans.dm
+1 -1
View File
@@ -1,6 +1,6 @@
#define DRYING_TIME 5 * 60 * 10 //for 1 unit of depth in puddle (amount var)
var/global/list/image/splatter_cache = list()
GLOBAL_LIST_EMPTY(splatter_cache)
/obj/effect/decal/cleanable/blood
name = "blood"
code/game/objects/effects/decals/Cleanable/tracks.dm
+9 -9
View File
@@ -2,7 +2,7 @@
#define TRACKS_CRUSTIFY_TIME 50
// color-dir-dry
var/global/list/image/fluidtrack_cache = list()
GLOBAL_LIST_EMPTY(fluidtrack_cache)
// Footprints, tire trails...
/obj/effect/decal/cleanable/blood/tracks
@@ -55,7 +55,7 @@ var/global/list/image/fluidtrack_cache = list()
if(!(entered_dirs & H.dir))
entered_dirs |= H.dir
update_icon()
/obj/effect/decal/cleanable/blood/footprints/Uncrossed(atom/movable/O)
..()
if(ishuman(O))
@@ -87,24 +87,24 @@ var/global/list/image/fluidtrack_cache = list()
/obj/effect/decal/cleanable/blood/footprints/update_icon()
overlays.Cut()
for(var/Ddir in cardinal)
for(var/Ddir in GLOB.cardinal)
if(entered_dirs & Ddir)
var/image/I
if(fluidtrack_cache["entered-[blood_state]-[Ddir]"])
I = fluidtrack_cache["entered-[blood_state]-[Ddir]"]
if(GLOB.fluidtrack_cache["entered-[blood_state]-[Ddir]"])
I = GLOB.fluidtrack_cache["entered-[blood_state]-[Ddir]"]
else
I = image(icon,"[blood_state]1",dir = Ddir)
fluidtrack_cache["entered-[blood_state]-[Ddir]"] = I
GLOB.fluidtrack_cache["entered-[blood_state]-[Ddir]"] = I
if(I)
I.color = basecolor
overlays += I
if(exited_dirs & Ddir)
var/image/I
if(fluidtrack_cache["exited-[blood_state]-[Ddir]"])
I = fluidtrack_cache["exited-[blood_state]-[Ddir]"]
if(GLOB.fluidtrack_cache["exited-[blood_state]-[Ddir]"])
I = GLOB.fluidtrack_cache["exited-[blood_state]-[Ddir]"]
else
I = image(icon,"[blood_state]2",dir = Ddir)
fluidtrack_cache["exited-[blood_state]-[Ddir]"] = I
GLOB.fluidtrack_cache["exited-[blood_state]-[Ddir]"] = I
if(I)
I.color = basecolor
overlays += I
code/game/objects/effects/effect_system.dm
+4 -4
View File
@@ -118,10 +118,10 @@ would spawn and follow the beaker, even if it is carried or thrown.
// will always spawn at the items location, even if it's moved.
/* Example:
var/datum/effect/system/steam_spread/steam = new /datum/effect/system/steam_spread() -- creates new system
steam.set_up(5, 0, mob.loc) -- sets up variables
OPTIONAL: steam.attach(mob)
steam.start() -- spawns the effect
var/datum/effect/system/steam_spread/steam = new /datum/effect/system/steam_spread() -- creates new system
steam.set_up(5, 0, mob.loc) -- sets up variables
OPTIONAL: steam.attach(mob)
steam.start() -- spawns the effect
*/
/////////////////////////////////////////////
/obj/effect/effect/steam
code/game/objects/effects/effect_system/effect_system.dm
+4 -4
View File
@@ -14,11 +14,11 @@ would spawn and follow the beaker, even if it is carried or thrown.
/obj/effect/particle_effect/New()
..()
if(SSticker)
cameranet.updateVisibility(src)
GLOB.cameranet.updateVisibility(src)
/obj/effect/particle_effect/Destroy()
if(SSticker)
cameranet.updateVisibility(src)
GLOB.cameranet.updateVisibility(src)
return ..()
/datum/effect_system
@@ -61,9 +61,9 @@ would spawn and follow the beaker, even if it is carried or thrown.
total_effects++
var/direction
if(cardinals)
direction = pick(cardinal)
direction = pick(GLOB.cardinal)
else
direction = pick(alldirs)
direction = pick(GLOB.alldirs)
var/steps_amt = pick(1,2,3)
for(var/j in 1 to steps_amt)
sleep(5)
code/game/objects/effects/effect_system/effects_explosion.dm
+1 -1
View File
@@ -15,7 +15,7 @@
for(var/i in 1 to number)
spawn(0)
var/obj/effect/particle_effect/expl_particles/expl = new /obj/effect/particle_effect/expl_particles(location)
var/direct = pick(alldirs)
var/direct = pick(GLOB.alldirs)
var/steps_amt = pick(1;25,2;50,3,4;200)
for(var/j in 1 to steps_amt)
sleep(1)
code/game/objects/effects/effect_system/effects_foam.dm
+1 -1
View File
@@ -60,7 +60,7 @@
if(--amount < 0)
return
for(var/direction in cardinal)
for(var/direction in GLOB.cardinal)
var/turf/T = get_step(src,direction)
if(!T)
code/game/objects/effects/effect_system/effects_other.dm
+3 -3
View File
@@ -172,13 +172,13 @@
// Clamp all values to MAX_EXPLOSION_RANGE
if(round(amount/12) > 0)
devastation = min (MAX_EX_DEVASTATION_RANGE, devastation + round(amount/12))
devastation = min (GLOB.max_ex_devastation_range, devastation + round(amount/12))
if(round(amount/6) > 0)
heavy = min (MAX_EX_HEAVY_RANGE, heavy + round(amount/6))
heavy = min (GLOB.max_ex_heavy_range, heavy + round(amount/6))
if(round(amount/3) > 0)
light = min (MAX_EX_LIGHT_RANGE, light + round(amount/3))
light = min (GLOB.max_ex_light_range, light + round(amount/3))
if(flashing && flashing_factor)
flash += (round(amount/4) * flashing_factor)
code/game/objects/effects/effect_system/effects_smoke.dm
+2 -2
View File
@@ -97,9 +97,9 @@
var/obj/effect/particle_effect/smoke/S = new effect_type(location)
if(!direction)
if(cardinals)
S.direction = pick(cardinal)
S.direction = pick(GLOB.cardinal)
else
S.direction = pick(alldirs)
S.direction = pick(GLOB.alldirs)
else
S.direction = direction
S.steps = pick(0,1,1,1,2,2,2,3)
code/game/objects/effects/effect_system/effects_water.dm
+4 -4
View File
@@ -33,10 +33,10 @@
// will always spawn at the items location, even if it's moved.
/* Example:
var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread() -- creates new system
steam.set_up(5, 0, mob.loc) -- sets up variables
OPTIONAL: steam.attach(mob)
steam.start() -- spawns the effect
var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread() -- creates new system
steam.set_up(5, 0, mob.loc) -- sets up variables
OPTIONAL: steam.attach(mob)
steam.start() -- spawns the effect
*/
/////////////////////////////////////////////
/obj/effect/particle_effect/steam
code/game/objects/effects/glowshroom.dm
+2 -2
View File
@@ -102,7 +102,7 @@
var/placeCount = 1
for(var/obj/structure/glowshroom/shroom in newLoc)
shroomCount++
for(var/wallDir in cardinal)
for(var/wallDir in GLOB.cardinal)
var/turf/isWall = get_step(newLoc,wallDir)
if(isWall.density)
placeCount++
@@ -123,7 +123,7 @@
/obj/structure/glowshroom/proc/CalcDir(turf/location = loc)
var/direction = 16
for(var/wallDir in cardinal)
for(var/wallDir in GLOB.cardinal)
var/turf/newTurf = get_step(location,wallDir)
if(newTurf.density)
direction |= wallDir
code/game/objects/effects/landmarks.dm
+21 -21
View File
@@ -13,80 +13,80 @@
switch(name) //some of these are probably obsolete
if("start")
newplayer_start += loc
GLOB.newplayer_start += loc
qdel(src)
if("wizard")
wizardstart += loc
GLOB.wizardstart += loc
qdel(src)
if("JoinLate")
latejoin += loc
GLOB.latejoin += loc
qdel(src)
if("JoinLateGateway")
latejoin_gateway += loc
GLOB.latejoin_gateway += loc
qdel(src)
if("JoinLateCryo")
latejoin_cryo += loc
GLOB.latejoin_cryo += loc
qdel(src)
if("JoinLateCyborg")
latejoin_cyborg += loc
GLOB.latejoin_cyborg += loc
qdel(src)
if("prisonwarp")
prisonwarp += loc
GLOB.prisonwarp += loc
qdel(src)
if("prisonsecuritywarp")
prisonsecuritywarp += loc
GLOB.prisonsecuritywarp += loc
qdel(src)
if("tdome1")
tdome1 += loc
GLOB.tdome1 += loc
if("tdome2")
tdome2 += loc
GLOB.tdome2 += loc
if("tdomeadmin")
tdomeadmin += loc
GLOB.tdomeadmin += loc
if("tdomeobserve")
tdomeobserve += loc
GLOB.tdomeobserve += loc
if("aroomwarp")
aroomwarp += loc
GLOB.aroomwarp += loc
if("blobstart")
blobstart += loc
GLOB.blobstart += loc
qdel(src)
if("xeno_spawn")
xeno_spawn += loc
GLOB.xeno_spawn += loc
qdel(src)
if("ninjastart")
ninjastart += loc
GLOB.ninjastart += loc
qdel(src)
if("carpspawn")
carplist += loc
GLOB.carplist += loc
if("voxstart")
raider_spawn += loc
GLOB.raider_spawn += loc
if("ERT Director")
ertdirector += loc
GLOB.ertdirector += loc
qdel(src)
if("Response Team")
emergencyresponseteamspawn += loc
GLOB.emergencyresponseteamspawn += loc
qdel(src)
if("Syndicate Officer")
syndicateofficer += loc
GLOB.syndicateofficer += loc
qdel(src)
GLOB.landmarks_list += src
code/game/objects/effects/snowcloud.dm
+1 -1
View File
@@ -52,7 +52,7 @@
/obj/effect/snowcloud/proc/try_to_spread_cloud()
if(prob(95 - parent_machine.cooling_speed * 5)) //10 / 15 / 20 / 25% chance to spawn a new cloud
return
var/list/random_dirs = shuffle(cardinal)
var/list/random_dirs = shuffle(GLOB.cardinal)
for(var/potential in random_dirs)
var/turf/T = get_turf(get_step(src, potential))
if(isspaceturf(T) || T.density)
code/game/objects/effects/spawners/gibspawner.dm
+3 -3
View File
@@ -11,7 +11,7 @@
gibamounts = list(1,1,1,1,1,1,1)
/obj/effect/gibspawner/human/New()
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), alldirs, alldirs, list())
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, GLOB.alldirs, list())
gibamounts[6] = pick(0,1,2)
..()
@@ -20,7 +20,7 @@
gibamounts = list(1,1,1,1,1,1,1)
/obj/effect/gibspawner/xeno/New()
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), alldirs, alldirs, list())
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, GLOB.alldirs, list())
gibamounts[6] = pick(0,1,2)
..()
@@ -30,6 +30,6 @@
gibamounts = list(1,1,1,1,1,1)
/obj/effect/gibspawner/robot/New()
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), alldirs, alldirs)
gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, GLOB.alldirs)
gibamounts[6] = pick(0,1,2)
..()
code/game/objects/effects/spawners/windowspawner.dm
+1 -1
View File
@@ -16,7 +16,7 @@
qdel(G) //just in case mappers don't know what they are doing
if(!useFull)
for(var/cdir in cardinal)
for(var/cdir in GLOB.cardinal)
for(var/obj/effect/spawner/window/WS in get_step(src,cdir))
cdir = null
break
code/game/objects/effects/temporary_visuals/miscellaneous.dm
+1 -1
View File
@@ -18,7 +18,7 @@
/obj/effect/temp_visual/dir_setting/bloodsplatter/New(loc, set_dir, blood_color)
if(blood_color)
color = blood_color
if(set_dir in diagonals)
if(set_dir in GLOB.diagonals)
icon_state = "[splatter_type][pick(1, 2, 6)]"
else
icon_state = "[splatter_type][pick(3, 4, 5)]"
code/game/objects/effects/temporary_visuals/temporary_visual.dm
+1 -1
View File
@@ -11,7 +11,7 @@
/obj/effect/temp_visual/Initialize(mapload)
. = ..()
if(randomdir)
setDir(pick(cardinal))
setDir(pick(GLOB.cardinal))
timerid = QDEL_IN(src, duration)
code/game/objects/explosion.dm
+8 -8
View File
@@ -11,11 +11,11 @@
if(!ignorecap)
// Clamp all values to MAX_EXPLOSION_RANGE
devastation_range = min (MAX_EX_DEVASTATION_RANGE, devastation_range)
heavy_impact_range = min (MAX_EX_HEAVY_RANGE, heavy_impact_range)
light_impact_range = min (MAX_EX_LIGHT_RANGE, light_impact_range)
flash_range = min (MAX_EX_FLASH_RANGE, flash_range)
flame_range = min (MAX_EX_FLAME_RANGE, flame_range)
devastation_range = min (GLOB.max_ex_devastation_range, devastation_range)
heavy_impact_range = min (GLOB.max_ex_heavy_range, heavy_impact_range)
light_impact_range = min (GLOB.max_ex_light_range, light_impact_range)
flash_range = min (GLOB.max_ex_flash_range, flash_range)
flame_range = min (GLOB.max_ex_flame_range, flame_range)
spawn(0)
var/watch = start_watch()
@@ -153,12 +153,12 @@
*/
var/took = stop_watch(watch)
//You need to press the DebugGame verb to see these now....they were getting annoying and we've collected a fair bit of data. Just -test- changes to explosion code using this please so we can compare
if(Debug2)
if(GLOB.debug2)
log_world("## DEBUG: Explosion([x0],[y0],[z0])(d[devastation_range],h[heavy_impact_range],l[light_impact_range]): Took [took] seconds.")
//Machines which report explosions.
for(var/i,i<=doppler_arrays.len,i++)
var/obj/machinery/doppler_array/Array = doppler_arrays[i]
for(var/i,i<=GLOB.doppler_arrays.len,i++)
var/obj/machinery/doppler_array/Array = GLOB.doppler_arrays[i]
if(Array)
Array.sense_explosion(x0,y0,z0,devastation_range,heavy_impact_range,light_impact_range,took,orig_dev_range,orig_heavy_range,orig_light_range)
code/game/objects/items.dm
+2 -3
View File
@@ -1,5 +1,4 @@
var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.dmi', "icon_state" = "fire")
GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effects/fire.dmi', "icon_state" = "fire"))
/obj/item
name = "item"
icon = 'icons/obj/items.dmi'
@@ -361,7 +360,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
//Generic refill proc. Transfers something (e.g. fuel, charge) from an atom to our tool. returns TRUE if it was successful, FALSE otherwise
//Not sure if there should be an argument that indicates what exactly is being refilled
/obj/item/proc/refill(mob/user, atom/A, amount)
/obj/item/proc/refill(mob/user, atom/A, amount)
return FALSE
/obj/item/proc/talk_into(mob/M, var/text, var/channel=null)
code/game/objects/items/blueprints.dm
+1 -1
View File
@@ -294,7 +294,7 @@
return ROOM_ERR_TOOLARGE
var/turf/T = pending[1] //why byond havent list::pop()?
pending -= T
for(var/dir in cardinal)
for(var/dir in GLOB.cardinal)
var/skip = 0
for(var/obj/structure/window/W in T)
if(dir == W.dir || (W.dir in list(NORTHEAST,SOUTHEAST,NORTHWEST,SOUTHWEST)))
code/game/objects/items/devices/aicard.dm
+2 -2
View File
@@ -40,7 +40,7 @@
ui_interact(user)
/obj/item/aicard/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state)
/obj/item/aicard/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.inventory_state)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "aicard.tmpl", "[name]", 600, 400, state = state)
@@ -48,7 +48,7 @@
ui.set_auto_update(1)
/obj/item/aicard/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state)
/obj/item/aicard/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.inventory_state)
var/data[0]
var/mob/living/silicon/ai/AI = locate() in src
code/game/objects/items/devices/autopsy.dm
+1 -1
View File
@@ -74,7 +74,7 @@
var/dead_notes = input("Insert any relevant notes")
var/obj/item/paper/R = new(user.loc)
R.name = "Official Coroner's Report - [dead_name]"
R.info = "<b>Nanotrasen Science Station [using_map.station_short] - Coroner's Report</b><br><br><b>Name of Deceased:</b> [dead_name]</br><br><b>Rank of Deceased:</b> [dead_rank]<br><br><b>Time of Death:</b> [dead_tod]<br><br><b>Cause of Death:</b> [dead_cause]<br><br><b>Trace Chemicals:</b> [dead_chems]<br><br><b>Additional Coroner's Notes:</b> [dead_notes]<br><br><b>Coroner's Signature:</b> <span class=\"paper_field\">"
R.info = "<b>Nanotrasen Science Station [GLOB.using_map.station_short] - Coroner's Report</b><br><br><b>Name of Deceased:</b> [dead_name]</br><br><b>Rank of Deceased:</b> [dead_rank]<br><br><b>Time of Death:</b> [dead_tod]<br><br><b>Cause of Death:</b> [dead_cause]<br><br><b>Trace Chemicals:</b> [dead_chems]<br><br><b>Additional Coroner's Notes:</b> [dead_notes]<br><br><b>Coroner's Signature:</b> <span class=\"paper_field\">"
playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1)
sleep(10)
user.put_in_hands(R)
code/game/objects/items/devices/camera_bug.dm
+1 -1
View File
@@ -73,7 +73,7 @@
/obj/item/camera_bug/proc/get_cameras()
if(world.time > (last_net_update + 100))
bugged_cameras = list()
for(var/obj/machinery/camera/camera in cameranet.cameras)
for(var/obj/machinery/camera/camera in GLOB.cameranet.cameras)
if(camera.stat || !camera.can_use())
continue
if(length(list("SS13","MINE")&camera.network))
code/game/objects/items/devices/instruments.dm
+1 -1
View File
@@ -35,7 +35,7 @@
song.ui_interact(user, ui_key, ui, force_open)
/obj/item/instrument/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/item/instrument/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
return song.ui_data(user, ui_key, state)
/obj/item/instrument/Topic(href, href_list)
code/game/objects/items/devices/paicard.dm
+1 -1
View File
@@ -264,7 +264,7 @@
return
last_request = world.time / 10
looking_for_personality = 1
paiController.findPAI(src, usr)
GLOB.paiController.findPAI(src, usr)
if(href_list["wipe"])
var/confirm = input("Are you CERTAIN you wish to delete the current personality? This action cannot be undone.", "Personality Wipe") in list("Yes", "No")
if(confirm == "Yes")
code/game/objects/items/devices/pipe_painter.dm
+2 -2
View File
@@ -9,7 +9,7 @@
/obj/item/pipe_painter/New()
..()
modes = new()
for(var/C in pipe_colors)
for(var/C in GLOB.pipe_colors)
modes += "[C]"
mode = pick(modes)
@@ -23,7 +23,7 @@
to_chat(user, "<span class='warning'>You must remove the plating first.</span>")
return
P.change_color(pipe_colors[mode])
P.change_color(GLOB.pipe_colors[mode])
/obj/item/pipe_painter/attack_self(mob/user as mob)
mode = input("Which colour do you want to use?", "Pipe Painter", mode) in modes
code/game/objects/items/devices/radio/electropack.dm
+1 -1
View File
@@ -103,7 +103,7 @@
ui.open()
ui.set_auto_update(1)
/obj/item/radio/electropack/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/item/radio/electropack/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["power"] = on
code/game/objects/items/devices/radio/intercom.dm
+1 -1
View File
@@ -63,7 +63,7 @@
/obj/item/radio/intercom/department/medbay/New()
..()
internal_channels = default_medbay_channels.Copy()
internal_channels = GLOB.default_medbay_channels.Copy()
/obj/item/radio/intercom/department/security/New()
..()
code/game/objects/items/devices/radio/radio.dm
+11 -11
View File
@@ -1,4 +1,4 @@
var/global/list/default_internal_channels = list(
GLOBAL_LIST_INIT(default_internal_channels, list(
num2text(PUB_FREQ) = list(),
num2text(AI_FREQ) = list(ACCESS_CAPTAIN),
num2text(ERT_FREQ) = list(ACCESS_CENT_SPECOPS),
@@ -11,13 +11,13 @@ var/global/list/default_internal_channels = list(
num2text(SCI_FREQ) = list(ACCESS_RESEARCH),
num2text(SUP_FREQ) = list(ACCESS_CARGO),
num2text(SRV_FREQ) = list(ACCESS_HOP, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CLOWN, ACCESS_MIME)
)
))
var/global/list/default_medbay_channels = list(
GLOBAL_LIST_INIT(default_medbay_channels, list(
num2text(PUB_FREQ) = list(),
num2text(MED_FREQ) = list(ACCESS_MEDICAL),
num2text(MED_I_FREQ) = list(ACCESS_MEDICAL)
)
))
/obj/item/radio
icon = 'icons/obj/radio.dmi'
@@ -69,7 +69,7 @@ var/global/list/default_medbay_channels = list(
..()
wires = new(src)
internal_channels = default_internal_channels.Copy()
internal_channels = GLOB.default_internal_channels.Copy()
GLOB.global_radios |= src
/obj/item/radio/Destroy()
@@ -116,7 +116,7 @@ var/global/list/default_medbay_channels = list(
ui.open()
ui.set_auto_update(1)
/obj/item/radio/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/item/radio/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["mic_status"] = broadcasting
@@ -448,12 +448,12 @@ var/global/list/default_medbay_channels = list(
//#### Sending the signal to all subspace receivers ####//
for(var/obj/machinery/telecomms/receiver/R in telecomms_list)
for(var/obj/machinery/telecomms/receiver/R in GLOB.telecomms_list)
spawn(0)
R.receive_signal(signal)
// Allinone can act as receivers.
for(var/obj/machinery/telecomms/allinone/R in telecomms_list)
for(var/obj/machinery/telecomms/allinone/R in GLOB.telecomms_list)
spawn(0)
R.receive_signal(signal)
@@ -503,7 +503,7 @@ var/global/list/default_medbay_channels = list(
)
signal.frequency = connection.frequency // Quick frequency set
for(var/obj/machinery/telecomms/receiver/R in telecomms_list)
for(var/obj/machinery/telecomms/receiver/R in GLOB.telecomms_list)
spawn(0)
R.receive_signal(signal)
@@ -812,7 +812,7 @@ var/global/list/default_medbay_channels = list(
ui.open()
ui.set_auto_update(1)
/obj/item/radio/borg/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/item/radio/borg/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["mic_status"] = broadcasting
@@ -863,4 +863,4 @@ var/global/list/default_medbay_channels = list(
/obj/item/radio/phone/medbay/New()
..()
internal_channels = default_medbay_channels.Copy()
internal_channels = GLOB.default_medbay_channels.Copy()
code/game/objects/items/devices/taperecorder.dm
-2
View File
@@ -194,13 +194,11 @@
if(mytape.storedinfo.len < i + 1)
playsleepseconds = 1
sleep(10)
T = get_turf(src)
atom_say("End of recording.")
else
playsleepseconds = mytape.timestamp[i + 1] - mytape.timestamp[i]
if(playsleepseconds > 14)
sleep(10)
T = get_turf(src)
atom_say("Skipping [playsleepseconds] seconds of silence.")
playsleepseconds = 1
i++
code/game/objects/items/devices/transfer_valve.dm
+1 -1
View File
@@ -100,7 +100,7 @@
// auto update every Master Controller tick
//ui.set_auto_update(1)
/obj/item/transfer_valve/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/item/transfer_valve/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["attachmentOne"] = tank_one ? tank_one.name : null
code/game/objects/items/devices/uplinks.dm
+7 -7
View File
@@ -6,7 +6,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
*/
var/list/world_uplinks = list()
GLOBAL_LIST_EMPTY(world_uplinks)
/obj/item/uplink
var/welcome // Welcoming menu message
@@ -35,10 +35,10 @@ var/list/world_uplinks = list()
uses = SSticker.mode.uplink_uses
uplink_items = get_uplink_items()
world_uplinks += src
GLOB.world_uplinks += src
/obj/item/uplink/Destroy()
world_uplinks -= src
GLOB.world_uplinks -= src
return ..()
/obj/item/uplink/proc/generate_items(mob/user as mob)
@@ -216,7 +216,7 @@ var/list/world_uplinks = list()
/*
NANO UI FOR UPLINK WOOP WOOP
*/
/obj/item/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state)
/obj/item/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.inventory_state)
var/title = "Remote Uplink"
// update the ui if it exists, returns null if no ui is passed/found
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
@@ -227,7 +227,7 @@ var/list/world_uplinks = list()
// open the new ui window
ui.open()
/obj/item/uplink/hidden/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state)
/obj/item/uplink/hidden/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.inventory_state)
var/data[0]
data["welcome"] = welcome
@@ -277,14 +277,14 @@ var/list/world_uplinks = list()
/obj/item/uplink/hidden/proc/update_nano_data(var/id)
if(nanoui_menu == 1)
var/permanentData[0]
for(var/datum/data/record/L in sortRecord(data_core.general))
for(var/datum/data/record/L in sortRecord(GLOB.data_core.general))
permanentData[++permanentData.len] = list(Name = sanitize(L.fields["name"]),"id" = L.fields["id"])
nanoui_data["exploit_records"] = permanentData
if(nanoui_menu == 11)
nanoui_data["exploit_exists"] = 0
for(var/datum/data/record/L in data_core.general)
for(var/datum/data/record/L in GLOB.data_core.general)
if(L.fields["id"] == id)
nanoui_data["exploit"] = list() // Setting this to equal L.fields passes it's variables that are lists as reference instead of value.
nanoui_data["exploit"]["name"] = html_encode(L.fields["name"])
code/game/objects/items/mountable_frames/mountables.dm
+1 -1
View File
@@ -20,7 +20,7 @@
return
if(proximity_flag != 1) //if we aren't next to the wall
return
if(!( get_dir(on_wall,user) in cardinal))
if(!( get_dir(on_wall,user) in GLOB.cardinal))
to_chat(user, "<span class='warning'>You need to be standing next to a wall to place \the [src].</span>")
return
code/game/objects/items/robot/robot_parts.dm
+2 -2
View File
@@ -14,7 +14,7 @@
..(newloc)
if(model_info && model)
model_info = model
var/datum/robolimb/R = all_robolimbs[model]
var/datum/robolimb/R = GLOB.all_robolimbs[model]
if(R)
name = "[R.company] [initial(name)]"
desc = "[R.desc]"
@@ -24,7 +24,7 @@
name = "robot [initial(name)]"
/obj/item/robot_parts/attack_self(mob/user)
var/choice = input(user, "Select the company appearance for this limb.", "Limb Company Selection") as null|anything in selectable_robolimbs
var/choice = input(user, "Select the company appearance for this limb.", "Limb Company Selection") as null|anything in GLOB.selectable_robolimbs
if(!choice)
return
if(loc != user)
code/game/objects/items/stacks/rods.dm
+3 -3
View File
@@ -1,7 +1,7 @@
var/global/list/datum/stack_recipe/rod_recipes = list ( \
GLOBAL_LIST_INIT(rod_recipes, list ( \
new/datum/stack_recipe("grille", /obj/structure/grille, 2, time = 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("table frame", /obj/structure/table_frame, 2, time = 10, one_per_turf = 1, on_floor = 1), \
)
))
/obj/item/stack/rods
name = "metal rod"
@@ -36,7 +36,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \
/obj/item/stack/rods/New(loc, amount=null)
..()
recipes = rod_recipes
recipes = GLOB.rod_recipes
update_icon()
/obj/item/stack/rods/update_icon()
code/game/objects/items/stacks/sheets/leather.dm
+6 -6
View File
@@ -9,13 +9,13 @@
singular_name = "human skin piece"
icon_state = "sheet-hide"
var/global/list/datum/stack_recipe/human_recipes = list( \
GLOBAL_LIST_INIT(human_recipes, list( \
new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/bloated_human, 5, on_floor = 1), \
new/datum/stack_recipe("bloated human costume head", /obj/item/clothing/head/human_head, 5, on_floor = 1), \
)
))
/obj/item/stack/sheet/animalhide/human/New(var/loc, var/amount=null)
recipes = human_recipes
recipes = GLOB.human_recipes
return ..()
/obj/item/stack/sheet/animalhide/generic
@@ -132,12 +132,12 @@ GLOBAL_LIST_INIT(leather_recipes, list (
icon_state = "sinew"
origin_tech = "biotech=4"
var/global/list/datum/stack_recipe/sinew_recipes = list ( \
GLOBAL_LIST_INIT(sinew_recipes, list ( \
new/datum/stack_recipe("sinew restraints", /obj/item/restraints/handcuffs/sinew, 1, on_floor = 1), \
)
))
/obj/item/stack/sheet/sinew/New(var/loc, var/amount=null)
recipes = sinew_recipes
recipes = GLOB.sinew_recipes
return ..()
/obj/item/stack/sheet/animalhide/goliath_hide
code/game/objects/items/stacks/sheets/mineral.dm
+33 -33
View File
@@ -15,16 +15,16 @@ Mineral Sheets
- Adamantine
*/
var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
GLOBAL_LIST_INIT(sandstone_recipes, list ( \
new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \
null, \
new/datum/stack_recipe("Assistant Statue", /obj/structure/statue/sandstone/assistant, 5, one_per_turf = 1, on_floor = 1), \
null, \
new/datum/stack_recipe("Breakdown into sand", /obj/item/stack/ore/glass, 1, one_per_turf = 0, on_floor = 1), \
)
))
var/global/list/datum/stack_recipe/silver_recipes = list ( \
GLOBAL_LIST_INIT(silver_recipes, list ( \
new/datum/stack_recipe("silver door", /obj/structure/mineral_door/silver, 10, one_per_turf = 1, on_floor = 1), \
null, \
new/datum/stack_recipe("silver tile", /obj/item/stack/tile/mineral/silver, 1, 4, 20), \
@@ -34,9 +34,9 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \
new/datum/stack_recipe("Sec Borg Statue", /obj/structure/statue/silver/secborg, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Med Doctor Statue", /obj/structure/statue/silver/md, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Med Borg Statue", /obj/structure/statue/silver/medborg, 5, one_per_turf = 1, on_floor = 1), \
)
))
var/global/list/datum/stack_recipe/diamond_recipes = list ( \
GLOBAL_LIST_INIT(diamond_recipes, list ( \
new/datum/stack_recipe("diamond door", /obj/structure/mineral_door/transparent/diamond, 10, one_per_turf = 1, on_floor = 1), \
null, \
new/datum/stack_recipe("diamond tile", /obj/item/stack/tile/mineral/diamond, 1, 4, 20), \
@@ -44,18 +44,18 @@ var/global/list/datum/stack_recipe/diamond_recipes = list ( \
new/datum/stack_recipe("Captain Statue", /obj/structure/statue/diamond/captain, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("AI Hologram Statue", /obj/structure/statue/diamond/ai1, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("AI Core Statue", /obj/structure/statue/diamond/ai2, 5, one_per_turf = 1, on_floor = 1), \
)
))
var/global/list/datum/stack_recipe/uranium_recipes = list ( \
GLOBAL_LIST_INIT(uranium_recipes, list ( \
new/datum/stack_recipe("uranium door", /obj/structure/mineral_door/uranium, 10, one_per_turf = 1, on_floor = 1), \
null, \
new/datum/stack_recipe("uranium tile", /obj/item/stack/tile/mineral/uranium, 1, 4, 20), \
null, \
new/datum/stack_recipe("Nuke Statue", /obj/structure/statue/uranium/nuke, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Engineer Statue", /obj/structure/statue/uranium/eng, 5, one_per_turf = 1, on_floor = 1), \
)
))
var/global/list/datum/stack_recipe/gold_recipes = list ( \
GLOBAL_LIST_INIT(gold_recipes, list ( \
new/datum/stack_recipe("golden door", /obj/structure/mineral_door/gold, 10, one_per_turf = 1, on_floor = 1), \
null, \
new/datum/stack_recipe("gold tile", /obj/item/stack/tile/mineral/gold, 1, 4, 20), \
@@ -67,51 +67,51 @@ var/global/list/datum/stack_recipe/gold_recipes = list ( \
new/datum/stack_recipe("CMO Statue", /obj/structure/statue/gold/cmo, 5, one_per_turf = 1, on_floor = 1), \
null, \
new/datum/stack_recipe("Simple Crown", /obj/item/clothing/head/crown, 5), \
)
))
var/global/list/datum/stack_recipe/plasma_recipes = list ( \
GLOBAL_LIST_INIT(plasma_recipes, list ( \
new/datum/stack_recipe/dangerous("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \
null, \
new/datum/stack_recipe/dangerous("plasma tile", /obj/item/stack/tile/mineral/plasma, 1, 4, 20), \
null, \
new/datum/stack_recipe/dangerous("Scientist Statue", /obj/structure/statue/plasma/scientist, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe/dangerous("Xenomorph Statue", /obj/structure/statue/plasma/xeno, 5, one_per_turf = 1, on_floor = 1), \
)
))
var/global/list/datum/stack_recipe/bananium_recipes = list ( \
GLOBAL_LIST_INIT(bananium_recipes, list ( \
new/datum/stack_recipe("bananium tile", /obj/item/stack/tile/mineral/bananium, 1, 4, 20), \
null, \
new/datum/stack_recipe("Clown Statue", /obj/structure/statue/bananium/clown, 5, one_per_turf = 1, on_floor = 1), \
null, \
new/datum/stack_recipe("bananium computer frame", /obj/structure/computerframe/HONKputer, 50, time = 25, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("bananium grenade casing", /obj/item/grenade/bananade/casing, 4, on_floor = 1), \
)
))
var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
GLOBAL_LIST_INIT(tranquillite_recipes, list ( \
new/datum/stack_recipe("invisible wall", /obj/structure/barricade/mime, 5, one_per_turf = 1, on_floor = 1, time = 50), \
null, \
new/datum/stack_recipe("silent tile", /obj/item/stack/tile/mineral/tranquillite, 1, 4, 20), \
null, \
new/datum/stack_recipe("Mime Statue", /obj/structure/statue/tranquillite/mime, 5, one_per_turf = 1, on_floor = 1), \
)
))
var/global/list/datum/stack_recipe/abductor_recipes = list ( \
GLOBAL_LIST_INIT(abductor_recipes, list ( \
new/datum/stack_recipe("alien bed", /obj/structure/bed/abductor, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("alien locker", /obj/structure/closet/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("alien table frame", /obj/structure/table_frame/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("alien airlock assembly", /obj/structure/door_assembly/door_assembly_abductor, 4, time = 20, one_per_turf = 1, on_floor = 1), \
null, \
new/datum/stack_recipe("alien floor tile", /obj/item/stack/tile/mineral/abductor, 1, 4, 20), \
)
))
var/global/list/datum/stack_recipe/adamantine_recipes = list(
GLOBAL_LIST_INIT(adamantine_recipes, list(
new /datum/stack_recipe("incomplete servant golem shell", /obj/item/golem_shell/servant, req_amount = 1, res_amount = 1), \
)
))
var/global/list/datum/stack_recipe/snow_recipes = list(
GLOBAL_LIST_INIT(snow_recipes, list(
new/datum/stack_recipe("snowman", /obj/structure/snowman, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Snowball", /obj/item/snowball, 1)
)
))
/obj/item/stack/sheet/mineral
force = 5
@@ -135,7 +135,7 @@ var/global/list/datum/stack_recipe/snow_recipes = list(
/obj/item/stack/sheet/mineral/sandstone/New()
..()
recipes = sandstone_recipes
recipes = GLOB.sandstone_recipes
/*
* Sandbags
@@ -186,7 +186,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
/obj/item/stack/sheet/mineral/diamond/New()
..()
recipes = diamond_recipes
recipes = GLOB.diamond_recipes
/obj/item/stack/sheet/mineral/uranium
name = "uranium"
@@ -199,7 +199,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
/obj/item/stack/sheet/mineral/uranium/New()
..()
recipes = uranium_recipes
recipes = GLOB.uranium_recipes
/obj/item/stack/sheet/mineral/plasma
name = "solid plasma"
@@ -214,7 +214,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
/obj/item/stack/sheet/mineral/plasma/New()
..()
recipes = plasma_recipes
recipes = GLOB.plasma_recipes
/obj/item/stack/sheet/mineral/plasma/welder_act(mob/user, obj/item/I)
if(I.use_tool(src, user, volume = I.tool_volume))
@@ -239,7 +239,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
/obj/item/stack/sheet/mineral/gold/New()
..()
recipes = gold_recipes
recipes = GLOB.gold_recipes
/obj/item/stack/sheet/mineral/silver
name = "silver"
@@ -252,7 +252,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
/obj/item/stack/sheet/mineral/silver/New()
..()
recipes = silver_recipes
recipes = GLOB.silver_recipes
/obj/item/stack/sheet/mineral/bananium
name = "bananium"
@@ -265,7 +265,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
/obj/item/stack/sheet/mineral/bananium/New(loc, amount=null)
..()
recipes = bananium_recipes
recipes = GLOB.bananium_recipes
/obj/item/stack/sheet/mineral/tranquillite
name = "tranquillite"
@@ -279,7 +279,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
/obj/item/stack/sheet/mineral/tranquillite/New(loc, amount=null)
..()
recipes = tranquillite_recipes
recipes = GLOB.tranquillite_recipes
/*
* Titanium
@@ -356,7 +356,7 @@ var/global/list/datum/stack_recipe/plastitanium_recipes = list (
sheettype = "abductor"
/obj/item/stack/sheet/mineral/abductor/New(loc, amount=null)
recipes = abductor_recipes
recipes = GLOB.abductor_recipes
..()
/obj/item/stack/sheet/mineral/adamantine
@@ -369,7 +369,7 @@ var/global/list/datum/stack_recipe/plastitanium_recipes = list (
wall_allowed = FALSE
/obj/item/stack/sheet/mineral/adamantine/New(loc, amount = null)
recipes = adamantine_recipes
recipes = GLOB.adamantine_recipes
..()
/*
@@ -385,5 +385,5 @@ var/global/list/datum/stack_recipe/plastitanium_recipes = list (
merge_type = /obj/item/stack/sheet/mineral/snow
/obj/item/stack/sheet/mineral/snow/New(loc, amount = null)
recipes = snow_recipes
recipes = GLOB.snow_recipes
..()
code/game/objects/items/stacks/sheets/sheet_types.dm
+22 -22
View File
@@ -13,7 +13,7 @@
/*
* Metal
*/
var/global/list/datum/stack_recipe/metal_recipes = list(
GLOBAL_LIST_INIT(metal_recipes, list(
new /datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("chair", /obj/structure/chair, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("shuttle seat", /obj/structure/chair/comfy/shuttle, 2, one_per_turf = 1, on_floor = 1),
@@ -94,7 +94,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
new /datum/stack_recipe("intercom frame", /obj/item/mounted/frame/intercom, 2),
new /datum/stack_recipe("extinguisher cabinet frame", /obj/item/mounted/frame/extinguisher, 2),
null
)
))
/obj/item/stack/sheet/metal
name = "metal"
@@ -124,13 +124,13 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
qdel(src)
/obj/item/stack/sheet/metal/New(var/loc, var/amount=null)
recipes = metal_recipes
recipes = GLOB.metal_recipes
return ..()
/*
* Plasteel
*/
var/global/list/datum/stack_recipe/plasteel_recipes = list(
GLOBAL_LIST_INIT(plasteel_recipes, list(
new /datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = 1),
new /datum/stack_recipe("bomb assembly", /obj/machinery/syndicatebomb/empty, 3, time = 50),
new /datum/stack_recipe("Surgery Table", /obj/machinery/optable, 5, time = 50, one_per_turf = 1, on_floor = 1),
@@ -141,7 +141,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list(
new /datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 6, time = 50, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("vault door assembly", /obj/structure/door_assembly/door_assembly_vault, 8, time = 50, one_per_turf = 1, on_floor = 1),
)),
)
))
/obj/item/stack/sheet/plasteel
name = "plasteel"
@@ -159,13 +159,13 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list(
point_value = 23
/obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null)
recipes = plasteel_recipes
recipes = GLOB.plasteel_recipes
return ..()
/*
* Wood
*/
var/global/list/datum/stack_recipe/wood_recipes = list(
GLOBAL_LIST_INIT(wood_recipes, list(
new /datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1),
new /datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20),
new /datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \
@@ -178,7 +178,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
new /datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40),
new /datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40),
new /datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),
new /datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),
@@ -189,7 +189,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
new /datum/stack_recipe("loom", /obj/structure/loom, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new /datum/stack_recipe("fermenting barrel", /obj/structure/fermenting_barrel, 30, time = 50),
new /datum/stack_recipe("firebrand", /obj/item/match/firebrand, 2, time = 100)
)
))
/obj/item/stack/sheet/wood
name = "wooden planks"
@@ -203,13 +203,13 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
merge_type = /obj/item/stack/sheet/wood
/obj/item/stack/sheet/wood/New(var/loc, var/amount=null)
recipes = wood_recipes
recipes = GLOB.wood_recipes
return ..()
/*
* Cloth
*/
var/global/list/datum/stack_recipe/cloth_recipes = list ( \
GLOBAL_LIST_INIT(cloth_recipes, list ( \
new/datum/stack_recipe("white jumpsuit", /obj/item/clothing/under/color/white, 3), \
new/datum/stack_recipe("white shoes", /obj/item/clothing/shoes/white, 2), \
new/datum/stack_recipe("white scarf", /obj/item/clothing/accessory/scarf/white, 1), \
@@ -234,7 +234,7 @@ var/global/list/datum/stack_recipe/cloth_recipes = list ( \
new/datum/stack_recipe("white beanie", /obj/item/clothing/head/beanie, 2), \
null, \
new/datum/stack_recipe("blindfold", /obj/item/clothing/glasses/sunglasses/blindfold, 3), \
)
))
/obj/item/stack/sheet/cloth
name = "cloth"
@@ -248,7 +248,7 @@ var/global/list/datum/stack_recipe/cloth_recipes = list ( \
merge_type = /obj/item/stack/sheet/cloth
/obj/item/stack/sheet/cloth/New(loc, amount=null)
recipes = cloth_recipes
recipes = GLOB.cloth_recipes
..()
/obj/item/stack/sheet/cloth/ten
@@ -300,7 +300,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
/*
* Cardboard
*/
var/global/list/datum/stack_recipe/cardboard_recipes = list (
GLOBAL_LIST_INIT(cardboard_recipes, list (
new /datum/stack_recipe("box", /obj/item/storage/box),
new /datum/stack_recipe("large box", /obj/item/storage/box/large, 4),
new /datum/stack_recipe("patch pack", /obj/item/storage/pill_bottle/patch_pack, 2),
@@ -314,7 +314,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list (
new /datum/stack_recipe("cardboard tube", /obj/item/c_tube),
new /datum/stack_recipe("cardboard box", /obj/structure/closet/cardboard, 4),
new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5),
)
))
/obj/item/stack/sheet/cardboard/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/stamp/clown) && !istype(loc, /obj/item/storage))
@@ -336,21 +336,21 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list (
merge_type = /obj/item/stack/sheet/cardboard
/obj/item/stack/sheet/cardboard/New(var/loc, var/amt = null)
recipes = cardboard_recipes
recipes = GLOB.cardboard_recipes
return ..()
/*
* Runed Metal
*/
var/global/list/datum/stack_recipe/cult = list ( \
GLOBAL_LIST_INIT(cult_recipes, list ( \
new/datum/stack_recipe/cult("runed door", /obj/machinery/door/airlock/cult, 1, time = 50, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe/cult("runed girder", /obj/structure/girder/cult, 1, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe/cult("pylon", /obj/structure/cult/functional/pylon, 3, time = 40, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe/cult("forge", /obj/structure/cult/functional/forge, 5, time = 40, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe/cult("archives", /obj/structure/cult/functional/archives, 2, time = 40, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe/cult("altar", /obj/structure/cult/functional/altar, 5, time = 40, one_per_turf = 1, on_floor = 1), \
)
))
/obj/item/stack/sheet/runed_metal
name = "runed metal"
@@ -393,13 +393,13 @@ var/global/list/datum/stack_recipe/cult = list ( \
amount = 50
/obj/item/stack/sheet/runed_metal/New(var/loc, var/amount=null)
recipes = cult
recipes = GLOB.cult_recipes
return ..()
/*
* Brass
*/
var/global/list/datum/stack_recipe/brass_recipes = list (\
GLOBAL_LIST_INIT(brass_recipes, list (\
new/datum/stack_recipe("wall gear", /obj/structure/clockwork/wall_gear, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
null,
new/datum/stack_recipe/window("brass windoor", /obj/machinery/door/window/clockwork, 2, time = 30, on_floor = TRUE, window_checks = TRUE), \
@@ -408,7 +408,7 @@ var/global/list/datum/stack_recipe/brass_recipes = list (\
new/datum/stack_recipe/window("fulltile brass window", /obj/structure/window/reinforced/clockwork/fulltile, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("brass chair", /obj/structure/chair/brass, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("brass table frame", /obj/structure/table_frame/brass, 1, time = 5, one_per_turf = TRUE, on_floor = TRUE), \
)
))
/obj/item/stack/tile/brass
name = "brass"
@@ -428,7 +428,7 @@ var/global/list/datum/stack_recipe/brass_recipes = list (\
qdel(src)
/obj/item/stack/tile/brass/New(loc, amount=null)
recipes = brass_recipes
recipes = GLOB.brass_recipes
. = ..()
pixel_x = 0
pixel_y = 0
code/game/objects/items/stacks/tiles/tile_mineral.dm
+12 -12
View File
@@ -27,9 +27,9 @@
mineralType = "uranium"
materials = list(MAT_URANIUM=500)
var/global/list/datum/stack_recipe/gold_tile_recipes = list ( \
GLOBAL_LIST_INIT(gold_tile_recipes, list ( \
new/datum/stack_recipe("fancy gold tile", /obj/item/stack/tile/mineral/gold/fancy, max_res_amount = 20), \
)
))
/obj/item/stack/tile/mineral/gold
name = "gold tile"
@@ -42,11 +42,11 @@ var/global/list/datum/stack_recipe/gold_tile_recipes = list ( \
/obj/item/stack/tile/mineral/gold/New(loc, amount=null)
..()
recipes = gold_tile_recipes
recipes = GLOB.gold_tile_recipes
var/global/list/datum/stack_recipe/goldfancy_tile_recipes = list ( \
GLOBAL_LIST_INIT(goldfancy_tile_recipes, list ( \
new/datum/stack_recipe("regular gold tile", /obj/item/stack/tile/mineral/gold, max_res_amount = 20), \
)
))
/obj/item/stack/tile/mineral/gold/fancy
icon_state = "tile_goldfancy"
@@ -54,11 +54,11 @@ var/global/list/datum/stack_recipe/goldfancy_tile_recipes = list ( \
/obj/item/stack/tile/mineral/gold/fancy/New(loc, amount=null)
..()
recipes = goldfancy_tile_recipes
recipes = GLOB.goldfancy_tile_recipes
var/global/list/datum/stack_recipe/silver_tile_recipes = list ( \
GLOBAL_LIST_INIT(silver_tile_recipes, list ( \
new/datum/stack_recipe("fancy silver tile", /obj/item/stack/tile/mineral/silver/fancy, max_res_amount = 20), \
)
))
/obj/item/stack/tile/mineral/silver
name = "silver tile"
@@ -71,11 +71,11 @@ var/global/list/datum/stack_recipe/silver_tile_recipes = list ( \
/obj/item/stack/tile/mineral/silver/New(loc, amount=null)
..()
recipes = silver_tile_recipes
recipes = GLOB.silver_tile_recipes
var/global/list/datum/stack_recipe/silverfancy_tile_recipes = list ( \
GLOBAL_LIST_INIT(silverfancy_tile_recipes, list ( \
new/datum/stack_recipe("regular silver tile", /obj/item/stack/tile/mineral/silver, max_res_amount = 20), \
)
))
/obj/item/stack/tile/mineral/silver/fancy
icon_state = "tile_silverfancy"
@@ -83,7 +83,7 @@ var/global/list/datum/stack_recipe/silverfancy_tile_recipes = list ( \
/obj/item/stack/tile/mineral/silver/fancy/New(loc, amount=null)
..()
recipes = silverfancy_tile_recipes
recipes = GLOB.silverfancy_tile_recipes
/obj/item/stack/tile/mineral/diamond
name = "diamond tile"
code/game/objects/items/tools/multitool.dm
+3 -3
View File
@@ -73,13 +73,13 @@
/obj/item/multitool/ai_detect/proc/multitool_detect()
var/turf/our_turf = get_turf(src)
for(var/mob/living/silicon/ai/AI in ai_list)
for(var/mob/living/silicon/ai/AI in GLOB.ai_list)
if(AI.cameraFollow == src)
detect_state = PROXIMITY_ON_SCREEN
break
if(!detect_state && cameranet.chunkGenerated(our_turf.x, our_turf.y, our_turf.z))
var/datum/camerachunk/chunk = cameranet.getCameraChunk(our_turf.x, our_turf.y, our_turf.z)
if(!detect_state && GLOB.cameranet.chunkGenerated(our_turf.x, our_turf.y, our_turf.z))
var/datum/camerachunk/chunk = GLOB.cameranet.getCameraChunk(our_turf.x, our_turf.y, our_turf.z)
if(chunk)
if(chunk.seenby.len)
for(var/mob/camera/aiEye/A in chunk.seenby)
code/game/objects/items/toys.dm
+4 -4
View File
@@ -1208,10 +1208,10 @@ obj/item/toy/cards/deck/syndicate/black
var/list/messages = list()
var/datum/devilinfo/devil = randomDevilInfo()
messages += "Some fun facts about: [devil.truename]"
messages += "[lawlorify[LORE][devil.bane]]"
messages += "[lawlorify[LORE][devil.obligation]]"
messages += "[lawlorify[LORE][devil.ban]]"
messages += "[lawlorify[LORE][devil.banish]]"
messages += "[GLOB.lawlorify[LORE][devil.bane]]"
messages += "[GLOB.lawlorify[LORE][devil.obligation]]"
messages += "[GLOB.lawlorify[LORE][devil.ban]]"
messages += "[GLOB.lawlorify[LORE][devil.banish]]"
playsound(loc, 'sound/machines/click.ogg', 20, 1)
cooldown = TRUE
for(var/message in messages)
code/game/objects/items/weapons/AI_modules.dm
+7 -7
View File
@@ -84,7 +84,7 @@ AI MODULES
/obj/item/aiModule/proc/log_law_changes(var/mob/living/silicon/ai/target, var/mob/sender)
var/time = time2text(world.realtime,"hh:mm:ss")
lawchanges.Add("[time] <B>:</B> [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])")
GLOB.lawchanges.Add("[time] <B>:</B> [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])")
log_and_message_admins("used [src.name] on [target.name]([target.key])")
/obj/item/aiModule/proc/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
@@ -114,7 +114,7 @@ AI MODULES
var/law = text("Safeguard []. Individuals that threaten [] are not crew and must be eliminated.'", targetName, targetName)
to_chat(target, law)
target.add_supplied_law(4, law)
lawchanges.Add("The law specified [targetName]")
GLOB.lawchanges.Add("The law specified [targetName]")
/******************** oneCrewMember ********************/
/obj/item/aiModule/oneCrewMember
@@ -141,12 +141,12 @@ AI MODULES
if(!is_special_character(target)) // Makes sure the AI isn't a traitor before changing their law 0. --NeoFite
to_chat(target, law)
target.set_zeroth_law(law)
lawchanges.Add("The law specified [targetName]")
GLOB.lawchanges.Add("The law specified [targetName]")
else
to_chat(target, "[sender.real_name] attempted to modify your zeroth law.")// And lets them know that someone tried. --NeoFite
to_chat(target, "It would be in your best interest to play along with [sender.real_name] that [law]")
lawchanges.Add("The law specified [targetName], but the AI's existing law 0 cannot be overridden.")
GLOB.lawchanges.Add("The law specified [targetName], but the AI's existing law 0 cannot be overridden.")
/******************** ProtectStation ********************/
/obj/item/aiModule/protectStation
@@ -203,7 +203,7 @@ AI MODULES
if(!lawpos || lawpos < MIN_SUPPLIED_LAW_NUMBER)
lawpos = MIN_SUPPLIED_LAW_NUMBER
target.add_supplied_law(lawpos, law)
lawchanges.Add("The law was '[newFreeFormLaw]'")
GLOB.lawchanges.Add("The law was '[newFreeFormLaw]'")
/obj/item/aiModule/freeform/install(var/obj/machinery/computer/C)
if(!newFreeFormLaw)
@@ -332,7 +332,7 @@ AI MODULES
..()
var/law = "[newFreeFormLaw]"
target.add_inherent_law(law)
lawchanges.Add("The law is '[newFreeFormLaw]'")
GLOB.lawchanges.Add("The law is '[newFreeFormLaw]'")
/obj/item/aiModule/freeformcore/install(var/obj/machinery/computer/C)
if(!newFreeFormLaw)
@@ -358,7 +358,7 @@ AI MODULES
// ..() //We don't want this module reporting to the AI who dun it. --NEO
log_law_changes(target, sender)
lawchanges.Add("The law is '[newFreeFormLaw]'")
GLOB.lawchanges.Add("The law is '[newFreeFormLaw]'")
to_chat(target, "<span class='warning'>BZZZZT</span>")
var/law = "[newFreeFormLaw]"
target.add_ion_law(law)
code/game/objects/items/weapons/RCD.dm
+4 -4
View File
@@ -167,14 +167,14 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
/obj/item/rcd/attack_self_tk(mob/user)
radial_menu(user)
/obj/item/rcd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state)
/obj/item/rcd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.inventory_state)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "rcd.tmpl", "[name]", 450, 400, state = state)
ui.open()
ui.set_auto_update(1)
/obj/item/rcd/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state)
/obj/item/rcd/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.inventory_state)
var/data[0]
data["mode"] = mode
data["door_type"] = door_type
@@ -374,7 +374,7 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
QDEL_NULL(A)
for(var/obj/structure/window/W in T1.contents)
qdel(W)
for(var/cdir in cardinal)
for(var/cdir in GLOB.cardinal)
var/turf/T2 = get_step(T1, cdir)
if(locate(/obj/structure/window/full/shuttle) in T2)
continue // Shuttle windows? Nah. We don't need extra windows there.
@@ -408,7 +408,7 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
new /obj/structure/grille(A)
for(var/obj/structure/window/W in A)
qdel(W)
for(var/cdir in cardinal)
for(var/cdir in GLOB.cardinal)
var/turf/T = get_step(A, cdir)
if(locate(/obj/structure/grille) in T)
for(var/obj/structure/window/W in T)
code/game/objects/items/weapons/cards_ids.dm
+6 -6
View File
@@ -495,17 +495,17 @@
else if(department != "Civilian")
switch(department)
if("Engineering")
new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in engineering_positions
new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.engineering_positions
if("Medical")
new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in medical_positions
new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.medical_positions
if("Science")
new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in science_positions
new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.science_positions
if("Security")
new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in security_positions
new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.security_positions
if("Support")
new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in support_positions
new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.support_positions
if("Command")
new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in command_positions
new_job = input(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation") in GLOB.command_positions
if(!Adjacent(user))
return
code/game/objects/items/weapons/cosmetics.dm
+1 -1
View File
@@ -108,7 +108,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/head/C = H.get_organ("head")
var/datum/robolimb/robohead = all_robolimbs[C.model]
var/datum/robolimb/robohead = GLOB.all_robolimbs[C.model]
if(user.zone_selected == "mouth")
if(!get_location_accessible(H, "mouth"))
to_chat(user, "<span class='warning'>The mask is in the way.</span>")
code/game/objects/items/weapons/dice.dm
+2 -2
View File
@@ -178,9 +178,9 @@
spawn(40)
var/cap = 0
if(result > MAX_EX_LIGHT_RANGE && result != 20)
if(result > GLOB.max_ex_light_range && result != 20)
cap = 1
result = min(result, MAX_EX_LIGHT_RANGE) //Apply the bombcap
result = min(result, GLOB.max_ex_light_range) //Apply the bombcap
else if(result == 20) //Roll a nat 20, screw the bombcap
result = 24
var/turf/epicenter = get_turf(src)
code/game/objects/items/weapons/dna_injector.dm
+50 -50
View File
@@ -127,12 +127,12 @@
if(buf && buf.types & DNA2_BUF_SE)
if(block)
if(GetState() && block == MONKEYBLOCK && ishuman(M))
if(GetState() && block == GLOB.monkeyblock && ishuman(M))
attack_log = "injected with the Isolated [name] (MONKEY)"
message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] <span class='warning'>(MONKEY)</span>")
else
if(GetState(MONKEYBLOCK) && ishuman(M))
if(GetState(GLOB.monkeyblock) && ishuman(M))
attack_log = "injected with the Isolated [name] (MONKEY)"
message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the Isolated [name] <span class='warning'>(MONKEY)</span>")
@@ -165,7 +165,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/hulkmut/Initialize()
block = HULKBLOCK
block = GLOB.hulkblock
..()
/obj/item/dnainjector/antihulk
@@ -176,7 +176,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antihulk/Initialize()
block = HULKBLOCK
block = GLOB.hulkblock
..()
/obj/item/dnainjector/xraymut
@@ -187,7 +187,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/xraymut/Initialize()
block = XRAYBLOCK
block = GLOB.xrayblock
..()
/obj/item/dnainjector/antixray
@@ -198,7 +198,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antixray/Initialize()
block = XRAYBLOCK
block = GLOB.xrayblock
..()
/obj/item/dnainjector/firemut
@@ -209,7 +209,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/firemut/Initialize()
block = FIREBLOCK
block = GLOB.fireblock
..()
/obj/item/dnainjector/antifire
@@ -220,7 +220,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antifire/Initialize()
block = FIREBLOCK
block = GLOB.fireblock
..()
/obj/item/dnainjector/telemut
@@ -231,7 +231,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/telemut/Initialize()
block = TELEBLOCK
block = GLOB.teleblock
..()
/obj/item/dnainjector/telemut/darkbundle
@@ -247,7 +247,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antitele/Initialize()
block = TELEBLOCK
block = GLOB.teleblock
..()
/obj/item/dnainjector/nobreath
@@ -258,7 +258,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/nobreath/Initialize()
block = BREATHLESSBLOCK
block = GLOB.breathlessblock
..()
/obj/item/dnainjector/antinobreath
@@ -269,7 +269,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antinobreath/Initialize()
block = BREATHLESSBLOCK
block = GLOB.breathlessblock
..()
/obj/item/dnainjector/remoteview
@@ -280,7 +280,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/remoteview/Initialize()
block = REMOTEVIEWBLOCK
block = GLOB.remoteviewblock
..()
/obj/item/dnainjector/antiremoteview
@@ -291,7 +291,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antiremoteview/Initialize()
block = REMOTEVIEWBLOCK
block = GLOB.remoteviewblock
..()
/obj/item/dnainjector/regenerate
@@ -302,7 +302,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/regenerate/Initialize()
block = REGENERATEBLOCK
block = GLOB.regenerateblock
..()
/obj/item/dnainjector/antiregenerate
@@ -313,7 +313,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antiregenerate/Initialize()
block = REGENERATEBLOCK
block = GLOB.regenerateblock
..()
/obj/item/dnainjector/runfast
@@ -324,7 +324,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/runfast/Initialize()
block = INCREASERUNBLOCK
block = GLOB.increaserunblock
..()
/obj/item/dnainjector/antirunfast
@@ -335,7 +335,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antirunfast/Initialize()
block = INCREASERUNBLOCK
block = GLOB.increaserunblock
..()
/obj/item/dnainjector/morph
@@ -346,7 +346,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/morph/Initialize()
block = MORPHBLOCK
block = GLOB.morphblock
..()
/obj/item/dnainjector/antimorph
@@ -357,7 +357,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antimorph/Initialize()
block = MORPHBLOCK
block = GLOB.morphblock
..()
/obj/item/dnainjector/noprints
@@ -368,7 +368,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/noprints/Initialize()
block = NOPRINTSBLOCK
block = GLOB.noprintsblock
..()
/obj/item/dnainjector/antinoprints
@@ -379,7 +379,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antinoprints/Initialize()
block = NOPRINTSBLOCK
block = GLOB.noprintsblock
..()
/obj/item/dnainjector/insulation
@@ -390,7 +390,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/insulation/Initialize()
block = SHOCKIMMUNITYBLOCK
block = GLOB.shockimmunityblock
..()
/obj/item/dnainjector/antiinsulation
@@ -401,7 +401,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antiinsulation/Initialize()
block = SHOCKIMMUNITYBLOCK
block = GLOB.shockimmunityblock
..()
/obj/item/dnainjector/midgit
@@ -412,7 +412,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/midgit/Initialize()
block = SMALLSIZEBLOCK
block = GLOB.smallsizeblock
..()
/obj/item/dnainjector/antimidgit
@@ -423,7 +423,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antimidgit/Initialize()
block = SMALLSIZEBLOCK
block = GLOB.smallsizeblock
..()
/////////////////////////////////////
@@ -435,7 +435,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antiglasses/Initialize()
block = GLASSESBLOCK
block = GLOB.glassesblock
..()
/obj/item/dnainjector/glassesmut
@@ -446,7 +446,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/glassesmut/Initialize()
block = GLASSESBLOCK
block = GLOB.glassesblock
..()
/obj/item/dnainjector/epimut
@@ -457,7 +457,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/epimut/Initialize()
block = EPILEPSYBLOCK
block = GLOB.epilepsyblock
..()
/obj/item/dnainjector/antiepi
@@ -468,7 +468,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antiepi/Initialize()
block = EPILEPSYBLOCK
block = GLOB.epilepsyblock
..()
/obj/item/dnainjector/anticough
@@ -479,7 +479,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/anticough/Initialize()
block = COUGHBLOCK
block = GLOB.coughblock
..()
/obj/item/dnainjector/coughmut
@@ -490,7 +490,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/coughmut/Initialize()
block = COUGHBLOCK
block = GLOB.coughblock
..()
/obj/item/dnainjector/clumsymut
@@ -501,7 +501,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/clumsymut/Initialize()
block = CLUMSYBLOCK
block = GLOB.clumsyblock
..()
/obj/item/dnainjector/anticlumsy
@@ -512,7 +512,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/anticlumsy/Initialize()
block = CLUMSYBLOCK
block = GLOB.clumsyblock
..()
/obj/item/dnainjector/antitour
@@ -523,7 +523,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antitour/Initialize()
block = TWITCHBLOCK
block = GLOB.twitchblock
..()
/obj/item/dnainjector/tourmut
@@ -534,7 +534,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/tourmut/Initialize()
block = TWITCHBLOCK
block = GLOB.twitchblock
..()
/obj/item/dnainjector/stuttmut
@@ -545,7 +545,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/stuttmut/Initialize()
block = NERVOUSBLOCK
block = GLOB.nervousblock
..()
@@ -557,7 +557,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antistutt/Initialize()
block = NERVOUSBLOCK
block = GLOB.nervousblock
..()
/obj/item/dnainjector/blindmut
@@ -568,7 +568,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/blindmut/Initialize()
block = BLINDBLOCK
block = GLOB.blindblock
..()
/obj/item/dnainjector/antiblind
@@ -579,7 +579,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antiblind/Initialize()
block = BLINDBLOCK
block = GLOB.blindblock
..()
/obj/item/dnainjector/telemut
@@ -590,7 +590,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/telemut/Initialize()
block = TELEBLOCK
block = GLOB.teleblock
..()
/obj/item/dnainjector/antitele
@@ -601,7 +601,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antitele/Initialize()
block = TELEBLOCK
block = GLOB.teleblock
..()
/obj/item/dnainjector/deafmut
@@ -612,7 +612,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/deafmut/Initialize()
block = DEAFBLOCK
block = GLOB.deafblock
..()
/obj/item/dnainjector/antideaf
@@ -623,7 +623,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antideaf/Initialize()
block = DEAFBLOCK
block = GLOB.deafblock
..()
/obj/item/dnainjector/hallucination
@@ -634,7 +634,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/hallucination/Initialize()
block = HALLUCINATIONBLOCK
block = GLOB.hallucinationblock
..()
/obj/item/dnainjector/antihallucination
@@ -645,7 +645,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/antihallucination/Initialize()
block = HALLUCINATIONBLOCK
block = GLOB.hallucinationblock
..()
/obj/item/dnainjector/h2m
@@ -656,7 +656,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/h2m/Initialize()
block = MONKEYBLOCK
block = GLOB.monkeyblock
..()
/obj/item/dnainjector/m2h
@@ -667,7 +667,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/m2h/Initialize()
block = MONKEYBLOCK
block = GLOB.monkeyblock
..()
@@ -679,7 +679,7 @@
forcedmutation = TRUE
/obj/item/dnainjector/comic/Initialize()
block = COMICBLOCK
block = GLOB.comicblock
..()
/obj/item/dnainjector/anticomic
@@ -690,5 +690,5 @@
forcedmutation = TRUE
/obj/item/dnainjector/anticomic/Initialize()
block = COMICBLOCK
block = GLOB.comicblock
..()
code/game/objects/items/weapons/explosives.dm
+2
View File
@@ -229,6 +229,7 @@
desc = "A C4 charge with an altered chemical composition, designed to blind and deafen the occupants of a room before breaching."
/obj/item/grenade/plastic/c4_shaped/flash/prime()
var/turf/T
if(target && target.density)
T = get_step(get_turf(target), aim_dir)
else if(target)
@@ -266,6 +267,7 @@
addtimer(CALLBACK(null, .proc/explosion, T, 0, 0, 2), 3)
addtimer(CALLBACK(smoke, /datum/effect_system/smoke_spread/.proc/start), 3)
else
var/turf/T = get_step(location, aim_dir)
addtimer(CALLBACK(null, .proc/explosion, T, 0, 0, 2), 3)
addtimer(CALLBACK(smoke, /datum/effect_system/smoke_spread/.proc/start), 3)
code/game/objects/items/weapons/grenades/bananade.dm
+1 -1
View File
@@ -1,5 +1,5 @@
var/turf/T
// var/turf/T | This was made 14th September 2013, and has no use at all. Its being removed
/obj/item/grenade/bananade
name = "bananade"
code/game/objects/items/weapons/grenades/clowngrenade.dm
+1 -1
View File
@@ -20,7 +20,7 @@
*/
var/i = 0
var/number = 0
for(var/direction in alldirs)
for(var/direction in GLOB.alldirs)
for(i = 0; i < 2; i++)
number++
var/obj/item/grown/bananapeel/traitorpeel/peel = new /obj/item/grown/bananapeel/traitorpeel(get_turf(src.loc))
code/game/objects/items/weapons/holy_weapons.dm
+1 -1
View File
@@ -37,7 +37,7 @@
user.visible_message("<span class='warning'>[src] slips out of the grip of [user] as they try to pick it up, bouncing upwards and smacking [user.p_them()] in the face!</span>", \
"<span class='warning'>[src] slips out of your grip as you pick it up, bouncing upwards and smacking you in the face!</span>")
playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, 1, -1)
throw_at(get_edge_target_turf(user, pick(alldirs)), rand(1, 3), 5)
throw_at(get_edge_target_turf(user, pick(GLOB.alldirs)), rand(1, 3), 5)
/obj/item/nullrod/attack_self(mob/user)
code/game/objects/items/weapons/implants/implant_death_alarm.dm
+1 -1
View File
@@ -47,7 +47,7 @@
a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm")
qdel(src)
if("emp")
var/name = prob(50) ? t.name : pick(teleportlocs)
var/name = prob(50) ? t.name : pick(GLOB.teleportlocs)
a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm")
else
a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm")
code/game/objects/items/weapons/rpd.dm
+17 -17
View File
@@ -39,6 +39,21 @@
var/primary_sound = 'sound/machines/click.ogg'
var/alt_sound = null
//Lists of things
var/list/mainmenu = list(
list("category" = "Atmospherics", "mode" = RPD_ATMOS_MODE, "icon" = "wrench"),
list("category" = "Disposals", "mode" = RPD_DISPOSALS_MODE, "icon" = "recycle"),
list("category" = "Rotate", "mode" = RPD_ROTATE_MODE, "icon" = "rotate-right"),
list("category" = "Flip", "mode" = RPD_FLIP_MODE, "icon" = "exchange"),
list("category" = "Recycle", "mode" = RPD_DELETE_MODE, "icon" = "trash"))
var/list/pipemenu = list(
list("category" = "Normal", "pipemode" = RPD_ATMOS_PIPING),
list("category" = "Supply", "pipemode" = RPD_SUPPLY_PIPING),
list("category" = "Scrubber", "pipemode" = RPD_SCRUBBERS_PIPING),
list("category" = "Devices", "pipemode" = RPD_DEVICES),
list("category" = "Heat exchange", "pipemode" = RPD_HEAT_PIPING))
/obj/item/rpd/New()
..()
spark_system = new /datum/effect_system/spark_spread()
@@ -150,27 +165,12 @@
QDEL_NULL(P)
activate_rpd()
//Lists of things
var/list/mainmenu = list(
list("category" = "Atmospherics", "mode" = RPD_ATMOS_MODE, "icon" = "wrench"),
list("category" = "Disposals", "mode" = RPD_DISPOSALS_MODE, "icon" = "recycle"),
list("category" = "Rotate", "mode" = RPD_ROTATE_MODE, "icon" = "rotate-right"),
list("category" = "Flip", "mode" = RPD_FLIP_MODE, "icon" = "exchange"),
list("category" = "Recycle", "mode" = RPD_DELETE_MODE, "icon" = "trash"))
var/list/pipemenu = list(
list("category" = "Normal", "pipemode" = RPD_ATMOS_PIPING),
list("category" = "Supply", "pipemode" = RPD_SUPPLY_PIPING),
list("category" = "Scrubber", "pipemode" = RPD_SCRUBBERS_PIPING),
list("category" = "Devices", "pipemode" = RPD_DEVICES),
list("category" = "Heat exchange", "pipemode" = RPD_HEAT_PIPING))
//NanoUI stuff
/obj/item/rpd/attack_self(mob/user)
ui_interact(user)
/obj/item/rpd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state)
/obj/item/rpd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.inventory_state)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "rpd.tmpl", "[name]", 400, 650, state = state)
@@ -180,7 +180,7 @@ var/list/pipemenu = list(
/obj/item/rpd/AltClick(mob/user)
radial_menu(user)
/obj/item/rpd/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state)
/obj/item/rpd/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.inventory_state)
var/data[0]
data["iconrotation"] = iconrotation
data["mainmenu"] = mainmenu
code/game/objects/items/weapons/scrolls.dm
+2 -2
View File
@@ -47,12 +47,12 @@
var/A
A = input(user, "Area to jump to", "BOOYEA", A) as null|anything in teleportlocs
A = input(user, "Area to jump to", "BOOYEA", A) as null|anything in GLOB.teleportlocs
if(!A)
return
var/area/thearea = teleportlocs[A]
var/area/thearea = GLOB.teleportlocs[A]
if(user.stat || user.restrained())
return
code/game/objects/items/weapons/storage/boxes.dm
+1
View File
@@ -1059,6 +1059,7 @@
name = "clown box"
desc = "A colorful cardboard box for the clown"
icon_state = "box_clown"
var/robot_arm // This exists for bot construction
/obj/item/storage/box/emptysandbags
name = "box of empty sandbags"
code/game/objects/items/weapons/storage/firstaid.dm
+1
View File
@@ -23,6 +23,7 @@
var/treatment_virus = "spaceacillin"
var/med_bot_skin = null
var/syndicate_aligned = FALSE
var/robot_arm // This is for robot construction
/obj/item/storage/firstaid/fire
code/game/objects/items/weapons/tanks/tanks.dm
+1 -1
View File
@@ -156,7 +156,7 @@
// auto update every Master Controller tick
ui.set_auto_update(1)
/obj/item/tank/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/item/tank/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/using_internal
if(iscarbon(loc))
var/mob/living/carbon/C = loc
code/game/objects/items/weapons/weaponry.dm
+2 -2
View File
@@ -205,7 +205,7 @@
else if(prob(30))
visible_message("<span class='warning'>[owner] swings! And [p_they()] miss[p_es()]! How embarassing.</span>", "<span class='warning'>You swing! You miss! Oh no!</span>")
playsound(get_turf(owner), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
do_attack_animation(get_step(owner, pick(alldirs)), ATTACK_EFFECT_DISARM)
do_attack_animation(get_step(owner, pick(GLOB.alldirs)), ATTACK_EFFECT_DISARM)
deflectmode = FALSE
if(!istype(I, /obj/item/beach_ball))
lastdeflect = world.time + 3000
@@ -214,7 +214,7 @@
visible_message("<span class='warning'>[owner] swings and deflects [I]!</span>", "<span class='warning'>You swing and deflect the [I]!</span>")
playsound(get_turf(owner), 'sound/weapons/baseball_hit.ogg', 50, 1, -1)
do_attack_animation(I, ATTACK_EFFECT_DISARM)
I.throw_at(get_edge_target_turf(owner, pick(cardinal)), rand(8,10), 14, owner)
I.throw_at(get_edge_target_turf(owner, pick(GLOB.cardinal)), rand(8,10), 14, owner)
deflectmode = FALSE
if(!istype(I, /obj/item/beach_ball))
lastdeflect = world.time + 3000
code/game/objects/obj_defense.dm
+2 -2
View File
@@ -205,7 +205,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
if(!(resistance_flags & ON_FIRE) && (resistance_flags & FLAMMABLE) && !(resistance_flags & FIRE_PROOF))
resistance_flags |= ON_FIRE
SSfires.processing[src] = src
add_overlay(fire_overlay, TRUE)
add_overlay(GLOB.fire_overlay, TRUE)
return 1
///called when the obj is destroyed by fire
@@ -218,7 +218,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
/obj/proc/extinguish()
if(resistance_flags & ON_FIRE)
resistance_flags &= ~ON_FIRE
cut_overlay(fire_overlay, TRUE)
cut_overlay(GLOB.fire_overlay, TRUE)
SSfires.processing -= src
///Called when the obj is hit by a tesla bolt.
code/game/objects/objs.dm
+1 -1
View File
@@ -44,7 +44,7 @@
else
T.add_blueprints_preround(src)
/obj/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/state = default_state)
/obj/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/state = GLOB.default_state)
// Calling Topic without a corresponding window open causes runtime errors
if(!nowindow && ..())
return 1
code/game/objects/structures.dm
+2 -2
View File
@@ -18,11 +18,11 @@
if(climbable)
verbs += /obj/structure/proc/climb_on
if(SSticker)
cameranet.updateVisibility(src)
GLOB.cameranet.updateVisibility(src)
/obj/structure/Destroy()
if(SSticker)
cameranet.updateVisibility(src)
GLOB.cameranet.updateVisibility(src)
if(smooth)
var/turf/T = get_turf(src)
spawn(0)
code/game/objects/structures/crates_lockers/crates.dm
+1 -1
View File
@@ -212,7 +212,7 @@
/obj/structure/closet/crate/proc/notifyRecipient(var/destination)
var/msg = "[capitalize(name)] has arrived at [destination]."
if(destination in announce_beacons)
for(var/obj/machinery/requests_console/D in allConsoles)
for(var/obj/machinery/requests_console/D in GLOB.allRequestConsoles)
if(D.department in src.announce_beacons[destination])
D.createMessage(name, "Your Crate has Arrived!", msg, 1)
code/game/objects/structures/false_walls.dm
+1
View File
@@ -245,6 +245,7 @@
/obj/structure/falsewall/plasma/attackby(obj/item/W, mob/user, params)
if(is_hot(W) > 300)
var/turf/T = locate(user)
message_admins("Plasma falsewall ignited by [key_name_admin(user)] in [ADMIN_VERBOSEJMP(T)]")
log_game("Plasma falsewall ignited by [key_name(user)] in [AREACOORD(T)]")
investigate_log("was <font color='red'><b>ignited</b></font> by [key_name(user)]","atmos")
code/game/objects/structures/mirror.dm
+4 -4
View File
@@ -135,13 +135,13 @@
var/voice_mutation
switch(voice_choice)
if("Comic Sans")
voice_mutation = COMICBLOCK
voice_mutation = GLOB.comicblock
if("Wingdings")
voice_mutation = WINGDINGSBLOCK
voice_mutation = GLOB.wingdingsblock
if("Swedish")
voice_mutation = SWEDEBLOCK
voice_mutation = GLOB.swedeblock
if("Chav")
voice_mutation = CHAVBLOCK
voice_mutation = GLOB.chavblock
if(voice_mutation)
if(H.dna.GetSEState(voice_mutation))
H.dna.SetSEState(voice_mutation, FALSE)
code/game/objects/structures/misc.dm
+1 -1
View File
@@ -33,7 +33,7 @@
if(user.z != src.z) return
user.loc.loc.Exited(user)
user.loc = pick(carplist) // In the future, possibly make specific NinjaTele landmarks, and give him an option to teleport to North/South/East/West of SS13 instead of just hijacking a carpspawn.
user.loc = pick(GLOB.carplist) // In the future, possibly make specific NinjaTele landmarks, and give him an option to teleport to North/South/East/West of SS13 instead of just hijacking a carpspawn.
playsound(user.loc, 'sound/effects/phasein.ogg', 25, 1)
code/game/objects/structures/musician.dm
+2 -2
View File
@@ -121,7 +121,7 @@
ui.open()
ui.set_auto_update(1)
/datum/song/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/datum/song/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["lines"] = lines
@@ -309,7 +309,7 @@
song.ui_interact(user, ui_key, ui, force_open)
/obj/structure/piano/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/structure/piano/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
return song.ui_data(user, ui_key, state)
/obj/structure/piano/Topic(href, href_list)
code/game/objects/structures/safe.dm
+1 -1
View File
@@ -185,7 +185,7 @@ GLOBAL_LIST_EMPTY(safes)
ui.open()
ui.set_auto_update(1)
/obj/structure/safe/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/structure/safe/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
var/list/contents_names = list()
if(open)
code/game/objects/structures/tank_dispenser.dm
+1 -1
View File
@@ -38,7 +38,7 @@
/obj/structure/dispenser/attack_ghost(mob/user)
ui_interact(user)
/obj/structure/dispenser/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state)
/obj/structure/dispenser/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = GLOB.default_state)
user.set_machine(src)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
code/game/objects/structures/watercloset.dm
+1 -1
View File
@@ -704,7 +704,7 @@
return
if(proximity_flag != 1) //if we aren't next to the wall
return
if(!(get_dir(on_wall, user) in cardinal))
if(!(get_dir(on_wall, user) in GLOB.cardinal))
to_chat(user, "<span class='warning'>You need to be standing next to a wall to place \the [src].</span>")
return
return 1
code/game/objects/structures/window.dm
+6 -6
View File
@@ -1,6 +1,6 @@
var/global/wcBar = pick(list("#0d8395", "#58b5c3", "#58c366", "#90d79a", "#ffffff"))
var/global/wcBrig = pick(list("#aa0808", "#7f0606", "#ff0000"))
var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8fcf44", "#ffffff"))
GLOBAL_LIST_INIT(wcBar, pick(list("#0d8395", "#58b5c3", "#58c366", "#90d79a", "#ffffff")))
GLOBAL_LIST_INIT(wcBrig, pick(list("#aa0808", "#7f0606", "#ff0000")))
GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8fcf44", "#ffffff")))
/obj/proc/color_windows(obj/W)
var/list/wcBarAreas = list(/area/crew_quarters/bar)
@@ -13,11 +13,11 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
var/area/A = T.loc
if(is_type_in_list(A,wcBarAreas))
newcolor = wcBar
newcolor = GLOB.wcBar
else if(is_type_in_list(A,wcBrigAreas))
newcolor = wcBrig
newcolor = GLOB.wcBrig
else
newcolor = wcCommon
newcolor = GLOB.wcCommon
return newcolor