mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-10 09:54:52 +00:00
Merge pull request #9754 from Ghommie/Ghommie-cit330
porting "global to static"
This commit is contained in:
@@ -53,8 +53,6 @@
|
|||||||
|
|
||||||
var/parallax_movedir = 0
|
var/parallax_movedir = 0
|
||||||
|
|
||||||
var/global/global_uid = 0
|
|
||||||
var/uid
|
|
||||||
var/list/ambientsounds = GENERIC
|
var/list/ambientsounds = GENERIC
|
||||||
flags_1 = CAN_BE_DIRTY_1
|
flags_1 = CAN_BE_DIRTY_1
|
||||||
|
|
||||||
@@ -96,7 +94,6 @@ GLOBAL_LIST_EMPTY(teleportlocs)
|
|||||||
/area/Initialize()
|
/area/Initialize()
|
||||||
icon_state = ""
|
icon_state = ""
|
||||||
layer = AREA_LAYER
|
layer = AREA_LAYER
|
||||||
uid = ++global_uid
|
|
||||||
map_name = name // Save the initial (the name set in the map) name of the area.
|
map_name = name // Save the initial (the name set in the map) name of the area.
|
||||||
canSmoothWithAreas = typecacheof(canSmoothWithAreas)
|
canSmoothWithAreas = typecacheof(canSmoothWithAreas)
|
||||||
|
|
||||||
|
|||||||
@@ -25,14 +25,14 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE)
|
|||||||
var/canisterinfo = null
|
var/canisterinfo = null
|
||||||
var/hsbinfo = null
|
var/hsbinfo = null
|
||||||
//items that shouldn't spawn on the floor because they would bug or act weird
|
//items that shouldn't spawn on the floor because they would bug or act weird
|
||||||
var/global/list/spawn_forbidden = list(
|
var/static/list/spawn_forbidden = list(
|
||||||
/obj/item/tk_grab, /obj/item/implant, // not implanter, the actual thing that is inside you
|
/obj/item/tk_grab, /obj/item/implant, // not implanter, the actual thing that is inside you
|
||||||
/obj/item/assembly, /obj/item/onetankbomb, /obj/item/pda/ai,
|
/obj/item/assembly, /obj/item/onetankbomb, /obj/item/pda/ai,
|
||||||
/obj/item/smallDelivery, /obj/item/projectile,
|
/obj/item/smallDelivery, /obj/item/projectile,
|
||||||
/obj/item/borg/sight, /obj/item/borg/stun, /obj/item/robot_module)
|
/obj/item/borg/sight, /obj/item/borg/stun, /obj/item/robot_module)
|
||||||
|
|
||||||
/datum/hSB/proc/update()
|
/datum/hSB/proc/update()
|
||||||
var/global/list/hrefs = list(
|
var/static/list/hrefs = list(
|
||||||
"Space Gear",
|
"Space Gear",
|
||||||
"Suit Up (Space Travel Gear)" = "hsbsuit",
|
"Suit Up (Space Travel Gear)" = "hsbsuit",
|
||||||
"Spawn Gas Mask" = "hsbspawn&path=[/obj/item/clothing/mask/gas]",
|
"Spawn Gas Mask" = "hsbspawn&path=[/obj/item/clothing/mask/gas]",
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
var/destination_x
|
var/destination_x
|
||||||
var/destination_y
|
var/destination_y
|
||||||
|
|
||||||
var/global/datum/gas_mixture/immutable/space/space_gas = new
|
var/static/datum/gas_mixture/immutable/space/space_gas = new
|
||||||
plane = PLANE_SPACE
|
plane = PLANE_SPACE
|
||||||
layer = SPACE_LAYER
|
layer = SPACE_LAYER
|
||||||
light_power = 0.25
|
light_power = 0.25
|
||||||
|
|||||||
@@ -493,7 +493,7 @@
|
|||||||
desc = "You peer within this smokey orb and glimpse terrible fates befalling the escape shuttle."
|
desc = "You peer within this smokey orb and glimpse terrible fates befalling the escape shuttle."
|
||||||
icon = 'icons/obj/cult.dmi'
|
icon = 'icons/obj/cult.dmi'
|
||||||
icon_state ="shuttlecurse"
|
icon_state ="shuttlecurse"
|
||||||
var/global/curselimit = 0
|
var/static/curselimit = 0
|
||||||
|
|
||||||
/obj/item/shuttle_curse/attack_self(mob/living/user)
|
/obj/item/shuttle_curse/attack_self(mob/living/user)
|
||||||
if(!iscultist(user))
|
if(!iscultist(user))
|
||||||
@@ -530,7 +530,7 @@
|
|||||||
playsound(user.loc, 'sound/effects/glassbr1.ogg', 50, 1)
|
playsound(user.loc, 'sound/effects/glassbr1.ogg', 50, 1)
|
||||||
qdel(src)
|
qdel(src)
|
||||||
sleep(20)
|
sleep(20)
|
||||||
var/global/list/curses
|
var/static/list/curses
|
||||||
if(!curses)
|
if(!curses)
|
||||||
curses = list("A fuel technician just slit his own throat and begged for death.",
|
curses = list("A fuel technician just slit his own throat and begged for death.",
|
||||||
"The shuttle's navigation programming was replaced by a file containing just two words: IT COMES.",
|
"The shuttle's navigation programming was replaced by a file containing just two words: IT COMES.",
|
||||||
|
|||||||
@@ -28,8 +28,8 @@ Pipelines + Other Objects -> Pipe network
|
|||||||
var/piping_layer = PIPING_LAYER_DEFAULT
|
var/piping_layer = PIPING_LAYER_DEFAULT
|
||||||
var/pipe_flags = NONE
|
var/pipe_flags = NONE
|
||||||
|
|
||||||
var/global/list/iconsetids = list()
|
var/static/list/iconsetids = list()
|
||||||
var/global/list/pipeimages = list()
|
var/static/list/pipeimages = list()
|
||||||
|
|
||||||
var/image/pipe_vision_img = null
|
var/image/pipe_vision_img = null
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
unit_name = "new plant species sample"
|
unit_name = "new plant species sample"
|
||||||
export_types = list(/obj/item/seeds)
|
export_types = list(/obj/item/seeds)
|
||||||
var/needs_discovery = FALSE // Only for undiscovered species
|
var/needs_discovery = FALSE // Only for undiscovered species
|
||||||
var/global/list/discoveredPlants = list()
|
var/static/list/discoveredPlants = list()
|
||||||
|
|
||||||
/datum/export/seed/get_cost(obj/O)
|
/datum/export/seed/get_cost(obj/O)
|
||||||
var/obj/item/seeds/S = O
|
var/obj/item/seeds/S = O
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
spawn_positions = 1
|
spawn_positions = 1
|
||||||
supervisors = "the head of personnel"
|
supervisors = "the head of personnel"
|
||||||
selection_color = "#bbe291"
|
selection_color = "#bbe291"
|
||||||
var/global/janitors = 0
|
|
||||||
|
|
||||||
outfit = /datum/outfit/job/janitor
|
outfit = /datum/outfit/job/janitor
|
||||||
|
|
||||||
|
|||||||
@@ -73,7 +73,7 @@
|
|||||||
shuttleId = "mining"
|
shuttleId = "mining"
|
||||||
possible_destinations = "mining_home;mining_away;landing_zone_dock;mining_public"
|
possible_destinations = "mining_home;mining_away;landing_zone_dock;mining_public"
|
||||||
no_destination_swap = 1
|
no_destination_swap = 1
|
||||||
var/global/list/dumb_rev_heads = list()
|
var/static/list/dumb_rev_heads = list()
|
||||||
|
|
||||||
//ATTACK HAND IGNORING PARENT RETURN VALUE
|
//ATTACK HAND IGNORING PARENT RETURN VALUE
|
||||||
/obj/machinery/computer/shuttle/mining/attack_hand(mob/user)
|
/obj/machinery/computer/shuttle/mining/attack_hand(mob/user)
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
var/ethernet = 0 // Hard-wired, therefore always on, ignores NTNet wireless checks.
|
var/ethernet = 0 // Hard-wired, therefore always on, ignores NTNet wireless checks.
|
||||||
malfunction_probability = 1
|
malfunction_probability = 1
|
||||||
device_type = MC_NET
|
device_type = MC_NET
|
||||||
var/global/ntnet_card_uid = 1
|
var/static/ntnet_card_uid = 1
|
||||||
|
|
||||||
/obj/item/computer_hardware/network_card/diagnostics(var/mob/user)
|
/obj/item/computer_hardware/network_card/diagnostics(var/mob/user)
|
||||||
..()
|
..()
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
|
|||||||
var/obj/item/coin/coin
|
var/obj/item/coin/coin
|
||||||
var/obj/item/stack/spacecash/bill
|
var/obj/item/stack/spacecash/bill
|
||||||
|
|
||||||
var/global/vending_cache = list() //used for storing the icons of items being vended
|
var/static/vending_cache = list() //used for storing the icons of items being vended
|
||||||
|
|
||||||
var/dish_quants = list() //used by the snack machine's custom compartment to count dishes.
|
var/dish_quants = list() //used by the snack machine's custom compartment to count dishes.
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user