From 8e1a08e51321ede988cd388504bb5a5c993f4b30 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Tue, 20 Aug 2024 12:32:50 +0200 Subject: [PATCH] uses definde strings --- .../vending/vendor_types/crew/vehicle_crew.dm | 6 +++--- code/game/supplyshuttle.dm | 6 +++--- code/game/supplyshuttle_upp.dm | 2 +- .../cm_marines/vehicle_part_fabricator.dm | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm index b733d57ec8eb..c215937e112e 100644 --- a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm +++ b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm @@ -22,15 +22,15 @@ available_points_to_display = 0 vend_flags = VEND_CLUTTER_PROTECTION|VEND_CATEGORY_CHECK|VEND_TO_HAND|VEND_USE_VENDOR_FLAGS - var/faction = "USCM" + var/faction = FACTION_MARINE var/datum/controller/supply/linked_supply_controller /obj/structure/machinery/cm_vending/gear/vehicle_crew/Initialize(mapload, ...) . = ..() switch(faction) - if("USCM") + if(FACTION_MARINE) linked_supply_controller = GLOB.supply_controller - if("UPP") + if(FACTION_UPP) linked_supply_controller = GLOB.supply_controller_upp else linked_supply_controller = GLOB.supply_controller //we default to normal budget on wrong input diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index abd581e9ad08..3658cf60e790 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -109,14 +109,14 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new()) var/last_viewed_group = "categories" var/first_time = TRUE var/datum/controller/supply/linked_supply_controller - var/faction = "USCM" + var/faction = FACTION_MARINE /obj/structure/machinery/computer/supplycomp/Initialize() . = ..() switch(faction) - if("USCM") + if(FACTION_MARINE) linked_supply_controller = GLOB.supply_controller - if("UPP") + if(FACTION_UPP) linked_supply_controller = GLOB.supply_controller_upp else linked_supply_controller = GLOB.supply_controller //we default to normal budget on wrong input diff --git a/code/game/supplyshuttle_upp.dm b/code/game/supplyshuttle_upp.dm index 99c18f131065..4ba55733f99d 100644 --- a/code/game/supplyshuttle_upp.dm +++ b/code/game/supplyshuttle_upp.dm @@ -4,7 +4,7 @@ GLOBAL_DATUM_INIT(supply_controller_upp, /datum/controller/supply/upp, new()) name = "UPP supply console" desc = "A console for the General Supply Storage" circuit = /obj/item/circuitboard/computer/supplycomp/upp - faction = "UPP" + faction = FACTION_UPP /obj/item/paper/manifest/upp name = "UPP Supply Manifest" diff --git a/code/modules/cm_marines/vehicle_part_fabricator.dm b/code/modules/cm_marines/vehicle_part_fabricator.dm index 114862dd6bb1..c8856c72b698 100644 --- a/code/modules/cm_marines/vehicle_part_fabricator.dm +++ b/code/modules/cm_marines/vehicle_part_fabricator.dm @@ -12,19 +12,19 @@ var/generate_points = TRUE var/omnisentry_price_scale = 100 var/omnisentry_price = 300 - var/faction = "USCM" + var/faction = FACTION_MARINE var/datum/controller/supply/linked_supply_controller /obj/structure/machinery/part_fabricator/upp name = "UPP part fabricator" - faction = "UPP" + faction = FACTION_UPP /obj/structure/machinery/part_fabricator/New() ..() switch(faction) - if("USCM") + if(FACTION_MARINE) linked_supply_controller = GLOB.supply_controller - if("UPP") + if(FACTION_UPP) linked_supply_controller = GLOB.supply_controller_upp else linked_supply_controller = GLOB.supply_controller @@ -143,11 +143,11 @@ unslashable = TRUE unacidable = TRUE - faction = "USCM" + faction = FACTION_MARINE /obj/structure/machinery/part_fabricator/dropship/upp name = "UPP dropship part fabricator" - faction = "UPP" + faction = FACTION_UPP /obj/structure/machinery/part_fabricator/dropship/get_point_store() return linked_supply_controller.dropship_points @@ -267,11 +267,11 @@ unacidable = TRUE indestructible = TRUE - faction = "USCM" + faction = FACTION_MARINE /obj/structure/machinery/part_fabricator/tank/upp name = "UPP vehicle part fabricator" - + faction = FACTION_UPP /obj/structure/machinery/part_fabricator/tank/get_point_store() return linked_supply_controller.tank_points