From 5aa946748a54b4201d1e9ba69128433349096a75 Mon Sep 17 00:00:00 2001 From: Doubleumc Date: Mon, 23 Sep 2024 17:33:16 -0400 Subject: [PATCH] initial --- code/modules/clothing/under/marine_uniform.dm | 10 ---------- code/modules/clothing/under/under.dm | 1 - code/modules/cm_preds/yaut_items.dm | 1 - code/modules/gear_presets/cmb.dm | 1 - code/modules/gear_presets/colonist.dm | 1 - code/modules/gear_presets/contractor.dm | 1 - code/modules/gear_presets/other.dm | 1 - code/modules/gear_presets/pmc.dm | 1 - code/modules/gear_presets/royal_marines.dm | 1 - code/modules/gear_presets/survivors/survivors.dm | 1 - code/modules/gear_presets/synths.dm | 1 - code/modules/gear_presets/wy_goons.dm | 1 - 12 files changed, 21 deletions(-) diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index a9aec9544641..1558ebaccd92 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -527,7 +527,6 @@ worn_state = "upp_uniform" min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT has_sensor = UNIFORM_HAS_SENSORS - sensor_faction = FACTION_UPP suit_restricted = list(/obj/item/clothing/suit/storage/marine/faction/UPP, /obj/item/clothing/suit/gimmick/jason, /obj/item/clothing/suit/storage/snow_suit/soviet, /obj/item/clothing/suit/storage/snow_suit/survivor, /obj/item/clothing/suit/storage/webbing) flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE @@ -696,7 +695,6 @@ icon_state = "colonist" worn_state = "colonist" has_sensor = UNIFORM_HAS_SENSORS - sensor_faction = FACTION_COLONIST /obj/item/clothing/under/colonist/workwear name = "grey workwear" @@ -737,7 +735,6 @@ desc = "A stylish grey-green jumpsuit - standard issue for colonists. This version appears to have the symbol of the Colonial Liberation Front emblazoned in select areas." icon_state = "clf_uniform" worn_state = "clf_uniform" - sensor_faction = FACTION_CLF /obj/item/clothing/under/colonist/ua_civvies name = "\improper UA gray utility uniform" @@ -745,7 +742,6 @@ icon_state = "ua_civvies" worn_state = "ua_civvies" has_sensor = UNIFORM_HAS_SENSORS - sensor_faction = FACTION_MARINE /obj/item/clothing/under/colonist/wy_davisone name = "\improper UA brown utility uniform" @@ -753,7 +749,6 @@ icon_state = "wy_davisone" worn_state = "wy_davisone" has_sensor = UNIFORM_HAS_SENSORS - sensor_faction = FACTION_MARINE /obj/item/clothing/under/colonist/white_service name = "white service uniform" @@ -761,7 +756,6 @@ icon_state = "CO_service" worn_state = "CO_service" has_sensor = UNIFORM_HAS_SENSORS - sensor_faction = FACTION_MARINE /obj/item/clothing/under/colonist/wy_joliet_shopsteward name = "steward utilities" @@ -769,7 +763,6 @@ icon_state = "wy_joliet_shopsteward" worn_state = "wy_joliet_shopsteward" has_sensor = UNIFORM_HAS_SENSORS - sensor_faction = FACTION_MARINE /obj/item/clothing/under/tshirt name = "T-shirt parent object" @@ -782,7 +775,6 @@ worn_state = "tshirt_w_br" displays_id = FALSE has_sensor = UNIFORM_HAS_SENSORS - sensor_faction = FACTION_MARINE /obj/item/clothing/under/tshirt/gray_blu name = "gray T-shirt and jeans" @@ -791,7 +783,6 @@ worn_state = "tshirt_gray_blu" displays_id = FALSE has_sensor = UNIFORM_HAS_SENSORS - sensor_faction = FACTION_MARINE /obj/item/clothing/under/tshirt/r_bla name = "red T-shirt and black pants" @@ -800,7 +791,6 @@ worn_state = "tshirt_r_bla" displays_id = FALSE has_sensor = UNIFORM_HAS_SENSORS - sensor_faction = FACTION_MARINE /obj/item/clothing/under/CM_uniform name = "\improper Colonial Marshal uniform" diff --git a/code/modules/clothing/under/under.dm b/code/modules/clothing/under/under.dm index a48967d88538..effd441ab81b 100644 --- a/code/modules/clothing/under/under.dm +++ b/code/modules/clothing/under/under.dm @@ -16,7 +16,6 @@ armor_internaldamage = CLOTHING_ARMOR_NONE w_class = SIZE_MEDIUM blood_overlay_type = "uniform" - var/sensor_faction = FACTION_MARINE var/has_sensor = UNIFORM_HAS_SENSORS // For the crew computer var/sensor_mode = SENSOR_MODE_LOCATION /* diff --git a/code/modules/cm_preds/yaut_items.dm b/code/modules/cm_preds/yaut_items.dm index 97b0f14f5b9b..a343cf6c3bfe 100644 --- a/code/modules/cm_preds/yaut_items.dm +++ b/code/modules/cm_preds/yaut_items.dm @@ -277,7 +277,6 @@ flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS|BODY_FLAG_FEET|BODY_FLAG_HANDS flags_item = ITEM_PREDATOR has_sensor = UNIFORM_HAS_SENSORS - sensor_faction = FACTION_YAUTJA siemens_coefficient = 0.9 min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index 672afa99873b..eef879e160d2 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -51,7 +51,6 @@ var/obj/item/clothing/under/uniform = new_human.w_uniform if(istype(uniform)) uniform.has_sensor = UNIFORM_HAS_SENSORS - uniform.sensor_faction = FACTION_MARINE return ..() //*****************************************************************************************************/ diff --git a/code/modules/gear_presets/colonist.dm b/code/modules/gear_presets/colonist.dm index a5b33c428f2e..59b508f078af 100644 --- a/code/modules/gear_presets/colonist.dm +++ b/code/modules/gear_presets/colonist.dm @@ -25,7 +25,6 @@ var/obj/item/clothing/under/uniform = new_human.w_uniform if(istype(uniform)) uniform.has_sensor = UNIFORM_HAS_SENSORS - uniform.sensor_faction = FACTION_COLONIST return ..() //*****************************************************************************************************/ diff --git a/code/modules/gear_presets/contractor.dm b/code/modules/gear_presets/contractor.dm index 2d8f4dd960fe..c0c2e7a79a03 100644 --- a/code/modules/gear_presets/contractor.dm +++ b/code/modules/gear_presets/contractor.dm @@ -54,7 +54,6 @@ var/obj/item/clothing/under/uniform = new_human.w_uniform if(istype(uniform)) uniform.has_sensor = UNIFORM_HAS_SENSORS - uniform.sensor_faction = FACTION_CONTRACTOR return ..() //*****************************************************************************************************/ diff --git a/code/modules/gear_presets/other.dm b/code/modules/gear_presets/other.dm index 063263748e02..73f8c5dc4df0 100644 --- a/code/modules/gear_presets/other.dm +++ b/code/modules/gear_presets/other.dm @@ -626,7 +626,6 @@ var/obj/item/clothing/under/uniform = new_human.w_uniform if(istype(uniform)) uniform.has_sensor = UNIFORM_HAS_SENSORS - uniform.sensor_faction = FACTION_COLONIST new_human.job = "Zombie" new_human.faction = faction return ..() diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm index 60f25442f04e..e280060cae34 100644 --- a/code/modules/gear_presets/pmc.dm +++ b/code/modules/gear_presets/pmc.dm @@ -50,7 +50,6 @@ var/obj/item/clothing/under/uniform = new_human.w_uniform if(istype(uniform)) uniform.has_sensor = UNIFORM_HAS_SENSORS - uniform.sensor_faction = FACTION_PMC return ..() diff --git a/code/modules/gear_presets/royal_marines.dm b/code/modules/gear_presets/royal_marines.dm index 2e218e5292a6..f59ade2eb75b 100644 --- a/code/modules/gear_presets/royal_marines.dm +++ b/code/modules/gear_presets/royal_marines.dm @@ -41,7 +41,6 @@ var/obj/item/clothing/under/uniform = new_human.w_uniform if(istype(uniform)) uniform.has_sensor = UNIFORM_HAS_SENSORS - uniform.sensor_faction = FACTION_TWE return ..() //*****************************************************************************************************/ diff --git a/code/modules/gear_presets/survivors/survivors.dm b/code/modules/gear_presets/survivors/survivors.dm index 1378bb6f6dbb..02cdf5cb9243 100644 --- a/code/modules/gear_presets/survivors/survivors.dm +++ b/code/modules/gear_presets/survivors/survivors.dm @@ -105,7 +105,6 @@ var/obj/item/clothing/under/uniform = new_human.w_uniform if(istype(uniform)) uniform.has_sensor = UNIFORM_HAS_SENSORS - uniform.sensor_faction = FACTION_COLONIST return ..() /* diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index db82e44ea890..6b6d7eb2b89d 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -164,7 +164,6 @@ var/obj/item/clothing/under/uniform = new_human.w_uniform if(istype(uniform)) uniform.has_sensor = UNIFORM_HAS_SENSORS - uniform.sensor_faction = FACTION_COLONIST return ..() /datum/equipment_preset/synth/survivor/medical_synth diff --git a/code/modules/gear_presets/wy_goons.dm b/code/modules/gear_presets/wy_goons.dm index a15e9b443302..859a9f33202a 100644 --- a/code/modules/gear_presets/wy_goons.dm +++ b/code/modules/gear_presets/wy_goons.dm @@ -51,7 +51,6 @@ var/obj/item/clothing/under/uniform = new_human.w_uniform if(istype(uniform)) uniform.has_sensor = UNIFORM_HAS_SENSORS - uniform.sensor_faction = FACTION_WY return ..()