diff --git a/code/modules/modular_computers/terminal/commands/ban.dm b/code/modules/modular_computers/terminal/commands/ban.dm index 42b5fcead3b2d..858ceb38699c9 100644 --- a/code/modules/modular_computers/terminal/commands/ban.dm +++ b/code/modules/modular_computers/terminal/commands/ban.dm @@ -20,7 +20,7 @@ return network_error() if(!length(arguments)) if (length(GLOB.ntnet_global.banned_nids)) - return list("[name]: The following network ids are banned:", jointext(ntnet_global.banned_nids, ", ")) + return list("[name]: The following network ids are banned:", jointext(GLOB.ntnet_global.banned_nids, ", ")) else return "[name]: There are no banned network ids." else if(length(arguments) == 2) diff --git a/code/modules/modular_computers/terminal/commands/log.dm b/code/modules/modular_computers/terminal/commands/log.dm index f5bfa8fffa222..4287b4f370aac 100644 --- a/code/modules/modular_computers/terminal/commands/log.dm +++ b/code/modules/modular_computers/terminal/commands/log.dm @@ -21,7 +21,7 @@ return "[name]: Error; unable to send email. [EMAIL_SYSADMIN] unavailable or missing." var/datum/computer_file/data/email_message/M = new() M.title = "!SENSITIVE! - NTNet System log backup" - M.stored_data = jointext(ntnet_global.logs, "
") + M.stored_data = jointext(GLOB.ntnet_global.logs, "
") M.source = S.login if(!S.send_mail(argument, M)) return "[name]: Error; could not send email to '[argument]'." diff --git a/code/modules/modular_computers/terminal/terminal_skill_fail.dm b/code/modules/modular_computers/terminal/terminal_skill_fail.dm index 45f34ba8125fc..451befe18840e 100644 --- a/code/modules/modular_computers/terminal/terminal_skill_fail.dm +++ b/code/modules/modular_computers/terminal/terminal_skill_fail.dm @@ -95,7 +95,7 @@ GLOBAL_LIST_INIT(terminal_fails, init_subtypes(/datum/terminal_skill_fail)) return list() var/datum/computer_file/data/email_message/M = new() M.title = "!SENSITIVE! - NTNet System log backup" - M.stored_data = jointext(ntnet_global.logs, "
") + M.stored_data = jointext(GLOB.ntnet_global.logs, "
") M.source = S.login if(!S.send_mail(EMAIL_BROADCAST, M)) return list() diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index ad403e4ed67c3..b45eea52fc48f 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -88,17 +88,17 @@ return if(href_list["togglep"]) - if(!wires.IsIndexCut(PARTICLE_TOGGLE_WIRE)) + if(!wires.IsIndexCut(GLOB.PARTICLE_TOGGLE_WIRE)) src.toggle_power() else if(href_list["scan"]) src.part_scan() else if(href_list["strengthup"]) - if(!wires.IsIndexCut(PARTICLE_STRENGTH_WIRE)) + if(!wires.IsIndexCut(GLOB.PARTICLE_STRENGTH_WIRE)) add_strength() else if(href_list["strengthdown"]) - if(!wires.IsIndexCut(PARTICLE_STRENGTH_WIRE)) + if(!wires.IsIndexCut(GLOB.PARTICLE_STRENGTH_WIRE)) remove_strength() src.updateDialog() diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm index 54d14dab730b7..ee38e008b493b 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm @@ -199,7 +199,7 @@ glass_name = "ice" glass_desc = "Generally, you're supposed to put something else in there too..." - glass_icon = DRINK_ICON_NOISY + glass_icon = GLOB.DRINK_ICON_NOISY heating_message = "cracks and melts." heating_products = list(/datum/reagent/water) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm index 3762a30055edf..9593c8967ca6e 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm @@ -74,7 +74,7 @@ value = DISPENSER_REAGENT_VALUE /datum/reagent/carbon/affect_ingest(mob/living/carbon/M, removed) - if (METABOLIC_INERTNESS(M) > TRAIT_LEVEL_MINOR) + if (METABOLIC_INERTNESS(M) > GLOB.TRAIT_LEVEL_MINOR) return var/datum/reagents/ingested = M.get_ingested_reagents() if (ingested && length(ingested.reagent_list) > 1) // Need to have at least 2 reagents - cabon and something to remove @@ -428,7 +428,7 @@ glass_name = "sugar" glass_desc = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste." - glass_icon = DRINK_ICON_NOISY + glass_icon = GLOB.DRINK_ICON_NOISY value = DISPENSER_REAGENT_VALUE /datum/reagent/sugar/affect_blood(mob/living/carbon/human/M, removed) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drinks.dm index 54d3eb9e3e372..71002010e0066 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drinks.dm @@ -102,7 +102,7 @@ /datum/reagent/drink/juice/lime/affect_ingest(mob/living/carbon/M, removed) ..() - if (METABOLIC_INERTNESS(M) > TRAIT_LEVEL_MINOR) + if (METABOLIC_INERTNESS(M) > GLOB.TRAIT_LEVEL_MINOR) return M.adjustToxLoss(-0.5 * removed) @@ -117,7 +117,7 @@ /datum/reagent/drink/juice/orange/affect_ingest(mob/living/carbon/M, removed) ..() - if (METABOLIC_INERTNESS(M) > TRAIT_LEVEL_MINOR) + if (METABOLIC_INERTNESS(M) > GLOB.TRAIT_LEVEL_MINOR) return M.adjustOxyLoss(-2 * removed) @@ -177,7 +177,7 @@ /datum/reagent/drink/juice/tomato/affect_ingest(mob/living/carbon/M, removed) ..() - if (METABOLIC_INERTNESS(M) > TRAIT_LEVEL_MINOR) + if (METABOLIC_INERTNESS(M) > GLOB.TRAIT_LEVEL_MINOR) return M.heal_organ_damage(0, 0.5 * removed) @@ -279,7 +279,7 @@ ..() holder.remove_reagent(/datum/reagent/capsaicin, 10 * removed) - if (METABOLIC_INERTNESS(M) > TRAIT_LEVEL_MINOR) + if (METABOLIC_INERTNESS(M) > GLOB.TRAIT_LEVEL_MINOR) return M.heal_organ_damage(0.5 * removed, 0) @@ -332,7 +332,7 @@ if(adj_temp > 0) holder.remove_reagent(/datum/reagent/frostoil, 10 * removed) - if (METABOLIC_INERTNESS(M) > TRAIT_LEVEL_MINOR) + if (METABOLIC_INERTNESS(M) > GLOB.TRAIT_LEVEL_MINOR) return ..() @@ -360,7 +360,7 @@ glass_name = "iced coffee" glass_desc = "A drink to perk you up and refresh you!" - glass_special = list(DRINK_ICE) + glass_special = list(GLOB.DRINK_ICE) /datum/reagent/drink/coffee/soy_latte name = "Soy Latte" @@ -508,7 +508,7 @@ glass_name = "soda water" glass_desc = "Soda water. Why not make a scotch and soda?" - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/grapesoda name = "Grape Soda" @@ -519,7 +519,7 @@ glass_name = "grape soda" glass_desc = "Looks like a delicious drink!" - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/tonic name = "Tonic Water" @@ -543,7 +543,7 @@ glass_name = "lemonade" glass_desc = "Oh the nostalgia..." - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/kiraspecial name = "Kira Special" @@ -554,7 +554,7 @@ glass_name = "Kira Special" glass_desc = "Long live the guy who everyone had mistaken for a girl. Baka!" - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/triplecitrus name = "Triple Citrus" @@ -575,7 +575,7 @@ glass_name = "Orange Soda" glass_desc = "A surprisingly tasty dye." - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/rootbeer name = "Root WeiBeer" @@ -586,7 +586,7 @@ glass_name = "Root Beer" glass_desc = "Yep that sure is some rooty beer." - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/apple_soda name = "Apple Soda" @@ -597,7 +597,7 @@ glass_name = "Apple Soda" glass_desc = "Disappointing cider." - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/strawberry_soda name = "Strawberry Soda" @@ -608,7 +608,7 @@ glass_name = "Strawberry Soda" glass_desc = "Attractive and alliterative." - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/porksoda name = "Pork Soda" @@ -620,7 +620,7 @@ glass_name = "Pork Soda" glass_desc = "I asked for a glass of PORT!" - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/milkshake name = "Milkshake" @@ -658,7 +658,7 @@ glass_name = "Nuka-Cola" glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland" - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/nuka_cola/affect_ingest(mob/living/carbon/M, removed) ..() @@ -698,7 +698,7 @@ glass_name = "Space Cola" glass_desc = "A glass of refreshing Space Cola" - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/spacemountainwind name = "Mountain Wind" @@ -711,7 +711,7 @@ glass_name = "Space Mountain Wind" glass_desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind." - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/dr_gibb name = "Dr. Gibb" @@ -733,7 +733,7 @@ glass_name = "Space-up" glass_desc = "Space-up. It helps keep your cool." - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/lemon_lime name = "Lemon Lime" @@ -744,7 +744,7 @@ glass_name = "lemon lime soda" glass_desc = "A tangy substance made of 0.5% natural citrus!" - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/doctor_delight name = "The Doctor's Delight" @@ -759,7 +759,7 @@ /datum/reagent/drink/doctor_delight/affect_ingest(mob/living/carbon/M, removed) ..() - if (METABOLIC_INERTNESS(M) > TRAIT_LEVEL_MINOR) + if (METABOLIC_INERTNESS(M) > GLOB.TRAIT_LEVEL_MINOR) return M.adjustOxyLoss(-4 * removed) M.heal_organ_damage(2 * removed, 2 * removed) @@ -795,7 +795,7 @@ /datum/reagent/drink/hell_ramen/affect_ingest(mob/living/carbon/M, removed) ..() - if (METABOLIC_INERTNESS(M) > TRAIT_LEVEL_MINOR) + if (METABOLIC_INERTNESS(M) > GLOB.TRAIT_LEVEL_MINOR) return M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT @@ -850,7 +850,7 @@ /datum/reagent/drink/beastenergy/affect_ingest(mob/living/carbon/M, removed) ..() - if (METABOLIC_INERTNESS(M) > TRAIT_LEVEL_MINOR) + if (METABOLIC_INERTNESS(M) > GLOB.TRAIT_LEVEL_MINOR) return M.drowsyness = max(0, M.drowsyness - 7) M.make_jittery(2) @@ -957,7 +957,7 @@ glass_name = "Cola Float" glass_desc = "A delicious combination ofice cream and cola" - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/vanilla_cola name = "Vanilla Cola" @@ -970,7 +970,7 @@ glass_name = "Vanilla Cola" glass_desc = "A glass of refreshing Space Cola with hints of vanilla." - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/orange_cola name = "Orange Cola" @@ -983,7 +983,7 @@ glass_name = "Orange Cola" glass_desc = "A glass of refreshing Space Cola with orange flavoring." - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/cherry_cola name = "Cherry Cola" @@ -996,7 +996,7 @@ glass_name = "Cherry Cola" glass_desc = "A glass of refreshing Space Cola with cherry flavoring." - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/coffee/coffee_cola name = "Coffee Cola" @@ -1009,7 +1009,7 @@ glass_name = "Coffee Cola" glass_desc = "All you need is some bread and butter and honey" - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/diet_cola name = "Diet Cola" @@ -1022,7 +1022,7 @@ glass_name = "Diet Cola" glass_desc = "A glass of refreshing Space Cola. This one's calorie-free!" - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/ionbru name = "Ion-Bru" @@ -1035,7 +1035,7 @@ glass_name = "Ion-Bru" glass_desc = "The official drink of some faraway, mountainous land." - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/ironbru name = "Iron-Bru" @@ -1048,7 +1048,7 @@ glass_name = "Iron-Bru" glass_desc = "The official drink of shipbuilders." - glass_special = list(DRINK_FIZZ) + glass_special = list(GLOB.DRINK_FIZZ) /datum/reagent/drink/dandelionburdock name = "Dandelion and Burdock" @@ -1115,7 +1115,7 @@ /datum/reagent/drink/tea/affect_ingest(mob/living/carbon/M, removed) ..() - if (METABOLIC_INERTNESS(M) > TRAIT_LEVEL_MINOR) + if (METABOLIC_INERTNESS(M) > GLOB.TRAIT_LEVEL_MINOR) return M.adjustToxLoss(-0.5 * removed) @@ -1127,7 +1127,7 @@ glass_name = "iced black tea" glass_desc = "It's the black tea you know and love, but now it's cold." - glass_special = list(DRINK_ICE) + glass_special = list(GLOB.DRINK_ICE) /datum/reagent/drink/tea/icetea/sweet name = "Sweet Black Tea" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Ethanol.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Ethanol.dm index 1c3fa5e5ffea5..76b7b0940533a 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Ethanol.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Ethanol.dm @@ -71,7 +71,7 @@ /datum/reagent/ethanol/beer/affect_ingest(mob/living/carbon/M, removed) ..() - if (METABOLIC_INERTNESS(M) > TRAIT_LEVEL_MINOR) + if (METABOLIC_INERTNESS(M) > GLOB.TRAIT_LEVEL_MINOR) return M.jitteriness = max(M.jitteriness - 3, 0) @@ -159,7 +159,7 @@ /datum/reagent/ethanol/deadrum/affect_ingest(mob/living/carbon/M, removed) ..() - if (METABOLIC_INERTNESS(M) > TRAIT_LEVEL_MINOR) + if (METABOLIC_INERTNESS(M) > GLOB.TRAIT_LEVEL_MINOR) return M.dizziness +=5 @@ -189,7 +189,7 @@ overdose = 45 /datum/reagent/ethanol/coffee/affect_ingest(mob/living/carbon/M, removed) - if (METABOLIC_INERTNESS(M) > TRAIT_LEVEL_MINOR) + if (METABOLIC_INERTNESS(M) > GLOB.TRAIT_LEVEL_MINOR) return ..() M.dizziness = max(0, M.dizziness - 5) @@ -309,7 +309,7 @@ /datum/reagent/ethanol/thirteenloko/affect_ingest(mob/living/carbon/M, removed) ..() - if (METABOLIC_INERTNESS(M) > TRAIT_LEVEL_MINOR) + if (METABOLIC_INERTNESS(M) > GLOB.TRAIT_LEVEL_MINOR) return M.drowsyness = max(0, M.drowsyness - 7) if (M.bodytemperature > 310) @@ -571,7 +571,7 @@ /datum/reagent/ethanol/drifter/affect_ingest(mob/living/carbon/M, removed) . = ..() - if (METABOLIC_INERTNESS(M) > TRAIT_LEVEL_MINOR) + if (METABOLIC_INERTNESS(M) > GLOB.TRAIT_LEVEL_MINOR) return var/sleep_chance = M.GetTraitLevel(/singleton/trait/malus/ethanol) || 1 if (prob(sleep_chance)) @@ -900,7 +900,7 @@ glass_name = "iced beer" glass_desc = "A beer so frosty, the air around it freezes." - glass_special = list(DRINK_ICE) + glass_special = list(GLOB.DRINK_ICE) /datum/reagent/ethanol/irishslammer name = "Irish Slammer" @@ -1108,7 +1108,7 @@ glass_name = "Neurotoxin" glass_desc = "A drink that is guaranteed to knock you silly." - glass_icon = DRINK_ICON_NOISY + glass_icon = GLOB.DRINK_ICON_NOISY glass_special = list("neuroright") /datum/reagent/ethanol/neurotoxin/affect_ingest(mob/living/carbon/M, removed) diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index dba016cb8ff0c..2e372cb05b43f 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -30,7 +30,7 @@ if (isid(W)) var/obj/item/card/id/ID = W - if(access_keycard_auth in ID.access) + if(GLOB.access_keycard_auth in ID.access) if(active == 1) //This is not the device that made the initial request. It is the device confirming the request. if(event_source && event_source.event_triggered_by != usr) diff --git a/code/modules/species/outsider/vox.dm b/code/modules/species/outsider/vox.dm index 1c52653f44496..5ed84132ba8f3 100644 --- a/code/modules/species/outsider/vox.dm +++ b/code/modules/species/outsider/vox.dm @@ -123,7 +123,7 @@ ingest_amount = 20 - traits = list(/singleton/trait/general/nonpermeable_skin = TRAIT_LEVEL_EXISTS) + traits = list(/singleton/trait/general/nonpermeable_skin = GLOB.TRAIT_LEVEL_EXISTS) /datum/species/vox/equip_survival_gear(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vox(H), slot_wear_mask) diff --git a/code/modules/species/station/golem.dm b/code/modules/species/station/golem.dm index 7339d1ef2a105..89f5b6ef66343 100644 --- a/code/modules/species/station/golem.dm +++ b/code/modules/species/station/golem.dm @@ -45,9 +45,9 @@ ) traits = list( - /singleton/trait/boon/clear_mind = TRAIT_LEVEL_MAJOR, - /singleton/trait/general/metabolically_inert = TRAIT_LEVEL_MAJOR, - /singleton/trait/general/nonpermeable_skin = TRAIT_LEVEL_EXISTS + /singleton/trait/boon/clear_mind = GLOB.TRAIT_LEVEL_MAJOR, + /singleton/trait/general/metabolically_inert = GLOB.TRAIT_LEVEL_MAJOR, + /singleton/trait/general/nonpermeable_skin = GLOB.TRAIT_LEVEL_EXISTS ) /datum/species/golem/handle_post_spawn(mob/living/carbon/human/H) diff --git a/code/modules/species/station/lizard.dm b/code/modules/species/station/lizard.dm index e9abe304cb38d..fd58d0051966b 100644 --- a/code/modules/species/station/lizard.dm +++ b/code/modules/species/station/lizard.dm @@ -154,9 +154,9 @@ ingest_amount = 20 traits = list( - /singleton/trait/boon/filtered_blood = TRAIT_LEVEL_EXISTS, - /singleton/trait/boon/cast_iron_stomach = TRAIT_LEVEL_EXISTS, - /singleton/trait/malus/sugar = TRAIT_LEVEL_MAJOR + /singleton/trait/boon/filtered_blood = GLOB.TRAIT_LEVEL_EXISTS, + /singleton/trait/boon/cast_iron_stomach = GLOB.TRAIT_LEVEL_EXISTS, + /singleton/trait/malus/sugar = GLOB.TRAIT_LEVEL_MAJOR ) footwear_trail_overrides = list( diff --git a/code/modules/species/station/monkey.dm b/code/modules/species/station/monkey.dm index 126cfdded4b2b..d5fcc41791602 100644 --- a/code/modules/species/station/monkey.dm +++ b/code/modules/species/station/monkey.dm @@ -129,9 +129,9 @@ ) traits = list( - /singleton/trait/boon/filtered_blood = TRAIT_LEVEL_EXISTS, - /singleton/trait/boon/cast_iron_stomach = TRAIT_LEVEL_EXISTS, - /singleton/trait/malus/sugar = TRAIT_LEVEL_MAJOR + /singleton/trait/boon/filtered_blood = GLOB.TRAIT_LEVEL_EXISTS, + /singleton/trait/boon/cast_iron_stomach = GLOB.TRAIT_LEVEL_EXISTS, + /singleton/trait/malus/sugar = GLOB.TRAIT_LEVEL_MAJOR ) /datum/say_list/monkey diff --git a/code/modules/species/station/nabber.dm b/code/modules/species/station/nabber.dm index eba875a8afae5..2e972a6d7124b 100644 --- a/code/modules/species/station/nabber.dm +++ b/code/modules/species/station/nabber.dm @@ -156,7 +156,7 @@ ingest_amount = 6 - traits = list(/singleton/trait/general/serpentid_adapted = TRAIT_LEVEL_EXISTS) + traits = list(/singleton/trait/general/serpentid_adapted = GLOB.TRAIT_LEVEL_EXISTS) tts_trait = TTS_TRAIT_ROBOTIZE /datum/species/nabber/New() diff --git a/code/modules/species/station/prometheans.dm b/code/modules/species/station/prometheans.dm index da2ba159c5074..95291ed6de936 100644 --- a/code/modules/species/station/prometheans.dm +++ b/code/modules/species/station/prometheans.dm @@ -72,7 +72,7 @@ var/global/datum/species/shapeshifter/promethean/prometheans var/heal_rate = 5 // Temp. Regen per tick. - traits = list(/singleton/trait/malus/water = TRAIT_LEVEL_MODERATE) + traits = list(/singleton/trait/malus/water = GLOB.TRAIT_LEVEL_MODERATE) /datum/species/shapeshifter/promethean/New() ..() diff --git a/code/modules/species/station/station.dm b/code/modules/species/station/station.dm index 2d2983b49e873..8f35173970af7 100644 --- a/code/modules/species/station/station.dm +++ b/code/modules/species/station/station.dm @@ -221,10 +221,10 @@ ingest_amount = 15 traits = list( - /singleton/trait/boon/clear_mind = TRAIT_LEVEL_MINOR, - /singleton/trait/malus/animal_protein = TRAIT_LEVEL_MAJOR, - /singleton/trait/malus/ethanol = TRAIT_LEVEL_MODERATE, - /singleton/trait/general/permeable_skin = TRAIT_LEVEL_MINOR + /singleton/trait/boon/clear_mind = GLOB.TRAIT_LEVEL_MINOR, + /singleton/trait/malus/animal_protein = GLOB.TRAIT_LEVEL_MAJOR, + /singleton/trait/malus/ethanol = GLOB.TRAIT_LEVEL_MODERATE, + /singleton/trait/general/permeable_skin = GLOB.TRAIT_LEVEL_MINOR ) bodyfall_sound = 'sound/effects/bodyfall_skrell.ogg' @@ -337,9 +337,9 @@ ) traits = list( - /singleton/trait/boon/clear_mind = TRAIT_LEVEL_MAJOR, - /singleton/trait/general/metabolically_inert = TRAIT_LEVEL_MODERATE, - /singleton/trait/general/nonpermeable_skin = TRAIT_LEVEL_EXISTS + /singleton/trait/boon/clear_mind = GLOB.TRAIT_LEVEL_MAJOR, + /singleton/trait/general/metabolically_inert = GLOB.TRAIT_LEVEL_MODERATE, + /singleton/trait/general/nonpermeable_skin = GLOB.TRAIT_LEVEL_EXISTS ) /proc/spawn_diona_nymph(turf/target)