Skip to content

Commit

Permalink
Remove sensor_faction from uniforms (#7205)
Browse files Browse the repository at this point in the history
# About the pull request

Removes the `sensor_faction` var from uniforms. It was vestigial and
never actually used.

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game

No need for pointless, unused code.
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
No player facing changes.
  • Loading branch information
Doubleumc authored Sep 24, 2024
1 parent 29a9420 commit c419186
Show file tree
Hide file tree
Showing 12 changed files with 0 additions and 21 deletions.
10 changes: 0 additions & 10 deletions code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -737,39 +735,34 @@
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"
desc = "A stylish gray jumpsuit - standard issue for UA civilian support personnel."
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"
desc = "A stylish brown jumpsuit - standard issue for UA civilian support personnel."
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"
desc = "A white dress shirt and tie with sleek pants. Standard clothing for anyone on professional business."
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"
desc = "A stylish brown vest and shorts - uniforms like this are often worn by clerks and shop stewards."
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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
1 change: 0 additions & 1 deletion code/modules/clothing/under/under.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
/*
Expand Down
1 change: 0 additions & 1 deletion code/modules/cm_preds/yaut_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion code/modules/gear_presets/cmb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()

//*****************************************************************************************************/
Expand Down
1 change: 0 additions & 1 deletion code/modules/gear_presets/colonist.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()

//*****************************************************************************************************/
Expand Down
1 change: 0 additions & 1 deletion code/modules/gear_presets/contractor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()

//*****************************************************************************************************/
Expand Down
1 change: 0 additions & 1 deletion code/modules/gear_presets/other.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()
Expand Down
1 change: 0 additions & 1 deletion code/modules/gear_presets/pmc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()


Expand Down
1 change: 0 additions & 1 deletion code/modules/gear_presets/royal_marines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()

//*****************************************************************************************************/
Expand Down
1 change: 0 additions & 1 deletion code/modules/gear_presets/survivors/survivors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()

/*
Expand Down
1 change: 0 additions & 1 deletion code/modules/gear_presets/synths.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion code/modules/gear_presets/wy_goons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()


Expand Down

0 comments on commit c419186

Please sign in to comment.