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

global lists global defined

Browse Source
This commit is contained in:
Desolate
2018-10-02 15:52:46 -05:00
parent c47df961d9
commit c974e29a3c
385 changed files with 1403 additions and 1403 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/helpers.dm
+1 -1
View File
@@ -15,7 +15,7 @@
current_surgery = S
if(!current_surgery)
var/list/all_surgeries = surgeries_list.Copy()
var/list/all_surgeries = GLOB.surgeries_list.Copy()
var/list/available_surgeries = list()
for(var/datum/surgery/S in all_surgeries)
code/modules/surgery/organs/blood.dm
+1 -1
View File
@@ -102,7 +102,7 @@
if(!(NO_BLOOD in dna.species.species_traits))
..()
if(dna.species.exotic_blood)
var/datum/reagent/R = chemical_reagents_list[get_blood_id()]
var/datum/reagent/R = GLOB.chemical_reagents_list[get_blood_id()]
if(istype(R) && isturf(loc))
R.reaction_turf(get_turf(src), amt)
code/modules/surgery/organs/organ_icon.dm
+4 -4
View File
@@ -112,7 +112,7 @@ var/global/list/limb_icon_cache = list()
var/head_marking = owner.m_styles["head"]
if(head_marking && head_marking != "None")
var/datum/sprite_accessory/head_marking_style = marking_styles_list[head_marking]
var/datum/sprite_accessory/head_marking_style = GLOB.marking_styles_list[head_marking]
if(head_marking_style && head_marking_style.species_allowed && (dna.species.name in head_marking_style.species_allowed) && head_marking_style.marking_location == "head")
var/icon/h_marking_s = new/icon("icon" = head_marking_style.icon, "icon_state" = "[head_marking_style.icon_state]_s")
if(head_marking_style.do_colouration)
@@ -120,7 +120,7 @@ var/global/list/limb_icon_cache = list()
overlays |= h_marking_s
if(ha_style)
var/datum/sprite_accessory/head_accessory_style = head_accessory_styles_list[ha_style]
var/datum/sprite_accessory/head_accessory_style = GLOB.head_accessory_styles_list[ha_style]
if(head_accessory_style && head_accessory_style.species_allowed && (dna.species.name in head_accessory_style.species_allowed))
var/icon/head_accessory_s = new/icon("icon" = head_accessory_style.icon, "icon_state" = "[head_accessory_style.icon_state]_s")
if(head_accessory_style.do_colouration)
@@ -128,7 +128,7 @@ var/global/list/limb_icon_cache = list()
overlays |= head_accessory_s
if(f_style)
var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[f_style]
var/datum/sprite_accessory/facial_hair_style = GLOB.facial_hair_styles_list[f_style]
if(facial_hair_style && ((facial_hair_style.species_allowed && (dna.species.name in facial_hair_style.species_allowed)) || (dna.species.bodyflags & ALL_RPARTS)))
var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
if(istype(dna.species, /datum/species/slime)) // I am el worstos
@@ -138,7 +138,7 @@ var/global/list/limb_icon_cache = list()
overlays |= facial_s
if(h_style && !(owner.head && (owner.head.flags & BLOCKHEADHAIR)))
var/datum/sprite_accessory/hair_style = hair_styles_full_list[h_style]
var/datum/sprite_accessory/hair_style = GLOB.hair_styles_full_list[h_style]
if(hair_style && ((dna.species.name in hair_style.species_allowed) || (dna.species.bodyflags & ALL_RPARTS)))
var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
if(istype(dna.species, /datum/species/slime)) // I am el worstos
code/modules/surgery/organs/subtypes/standard.dm
+2 -2
View File
@@ -211,8 +211,8 @@
disfigure()
/obj/item/organ/external/head/proc/handle_alt_icon()
if(alt_head && alt_heads_list[alt_head])
var/datum/sprite_accessory/alt_heads/alternate_head = alt_heads_list[alt_head]
if(alt_head && GLOB.alt_heads_list[alt_head])
var/datum/sprite_accessory/alt_heads/alternate_head = GLOB.alt_heads_list[alt_head]
if(alternate_head.icon_state)
icon_name = alternate_head.icon_state
else //If alternate_head.icon_state doesn't exist, that means alternate_head is "None", so default icon_name back to "head".
code/modules/surgery/surgery.dm
+5 -5
View File
@@ -211,7 +211,7 @@
E.germ_level += germs
/proc/sort_surgeries()
var/gap = surgery_steps.len
var/gap = GLOB.surgery_steps.len
var/swapped = 1
while(gap > 1 || swapped)
swapped = 0
@@ -219,9 +219,9 @@
gap = round(gap / 1.247330950103979)
if(gap < 1)
gap = 1
for(var/i = 1; gap + i <= surgery_steps.len; i++)
var/datum/surgery_step/l = surgery_steps[i] //Fucking hate
var/datum/surgery_step/r = surgery_steps[gap+i] //how lists work here
for(var/i = 1; gap + i <= GLOB.surgery_steps.len; i++)
var/datum/surgery_step/l = GLOB.surgery_steps[i] //Fucking hate
var/datum/surgery_step/r = GLOB.surgery_steps[gap+i] //how lists work here
if(l.priority < r.priority)
surgery_steps.Swap(i, gap + i)
GLOB.surgery_steps.Swap(i, gap + i)
swapped = 1