cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 13:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Readds suit sensors to all uniform items. (#17898)

Browse Source 
Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2024-01-06 12:35:44 +00:00
committed by GitHub
co-authored by Matt Atlas
parent d504d81ced
commit 185b4eda58
8 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
+1 -1
View File
@@ -1057,7 +1057,7 @@
equip_sound = 'sound/items/equip/jumpsuit.ogg'
///SUIT_NO_SENSORS = No sensors, SUIT_HAS_SENSORS = Sensors, SUIT_LOCKED_SENSORS = Locked sensors
var/has_sensor = SUIT_NO_SENSORS
var/has_sensor = SUIT_HAS_SENSORS
///SUIT_SENSOR_OFF = Off, SUIT_SENSOR_BINARY = Report living/dead, SUIT_SENSOR_VITAL = Report detailed damages, SUIT_SENSOR_TRACKING = Report location
var/sensor_mode = SUIT_SENSOR_OFF
code/modules/clothing/sets/captain.dm
-4
View File
@@ -36,7 +36,6 @@
icon_state = "uniform"
item_state = "uniform"
worn_state = "uniform"
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
var/is_open = FALSE
@@ -70,7 +69,6 @@
icon_state = "uniform_fem"
item_state = "uniform_fem"
worn_state = "uniform_fem"
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
var/is_open = FALSE
@@ -196,7 +194,6 @@
icon_state = "uniform"
item_state = "uniform"
worn_state = "uniform"
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
/obj/item/clothing/suit/captunic
@@ -231,5 +228,4 @@
icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
icon_state = "captain"
item_state = "captain"
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
code/modules/clothing/under/jobs/civilian.dm
+1 -13
View File
@@ -3,7 +3,6 @@
/obj/item/clothing/under/rank/bartender
name = "bartender's uniform"
desc = "It looks like it could use some more flair."
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
@@ -21,7 +20,6 @@
/obj/item/clothing/under/rank/chaplain
name = "chaplain's jumpsuit"
desc = "It's a black jumpsuit, often worn by religious folk."
has_sensor = SUIT_HAS_SENSORS
icon_state = "chaplain"
item_state = "bl_suit"
worn_state = "chapblack"
@@ -29,7 +27,6 @@
/obj/item/clothing/under/rank/chef
name = "chef's uniform"
desc = "It's an apron which is given only to the most <b>hardcore</b> chefs in space."
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
icon_state = "nt_chef"
@@ -48,7 +45,6 @@
/obj/item/clothing/under/rank/hydroponics
name = "botanist's jumpsuit"
desc = "It's a jumpsuit designed to protect against minor plant-related hazards."
has_sensor = SUIT_HAS_SENSORS
icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
icon_state = "nt_gardener"
item_state = "nt_gardener"
@@ -68,7 +64,6 @@
/obj/item/clothing/under/rank/liaison
name = "corporate liaison uniform"
desc = "The plain, professional attire of a corporate liaison. The collar is <i>immaculately</i> starched."
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
icon_state = "nt_liaison"
@@ -102,7 +97,6 @@
/obj/item/clothing/under/rank/janitor
name = "janitor's jumpsuit"
desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
icon_state = "nt_janitor"
@@ -150,7 +144,6 @@
/obj/item/clothing/under/librarian
name = "sensible suit"
desc = "It's very... sensible."
has_sensor = SUIT_HAS_SENSORS
icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
contained_sprite = TRUE
icon_state = "nt_librarian"
@@ -169,7 +162,6 @@
/obj/item/clothing/under/rank/miner
name = "miner's jumpsuit"
desc = "It's a snappy miner's jumpsuit, complete with overalls and caked-on dirt."
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
icon = 'icons/obj/item/clothing/department_uniforms/operations.dmi'
icon_state = "nt_miner"
@@ -186,7 +178,6 @@
/obj/item/clothing/under/rank/operations_manager
name = "operations manager's jumpsuit"
desc = "A uniform worn by the operations manager. It has the SCC insignia on it."
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
icon_state = "operations_manager"
@@ -195,7 +186,7 @@
/obj/item/clothing/under/rank/hangar_technician
name = "hangar technician's jumpsuit"
desc = "The future of hangar tech apparel: long, stuffy slacks. We never said it was a bright future."
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
icon = 'icons/obj/item/clothing/department_uniforms/operations.dmi'
icon_state = "nt_tech"
@@ -212,7 +203,6 @@
/obj/item/clothing/under/rank/bridge_crew
name = "bridge crew's jumpsuit"
desc = "The uniform worn by the SCC's bridge crew."
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
icon_state = "bridge_crew"
@@ -248,7 +238,6 @@
/obj/item/clothing/under/rank/xo
name = "executive officer's jumpsuit"
desc = "The uniform worn by the SCC's executive officers."
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
icon_state = "executive_officer"
@@ -257,7 +246,6 @@
/obj/item/clothing/under/rank/machinist
name = "machinist's jumpsuit"
desc = "A practical uniform designed for industrial work."
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
icon = 'icons/obj/item/clothing/department_uniforms/operations.dmi'
icon_state = "nt_machinist"
code/modules/clothing/under/jobs/engineering.dm
-3
View File
@@ -5,7 +5,6 @@
icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
icon_state = "chief_engineer"
item_state = "chief_engineer"
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
armor = list(
rad = ARMOR_RAD_MINOR
@@ -18,7 +17,6 @@
icon = 'icons/obj/item/clothing/department_uniforms/engineering.dmi'
icon_state = "nt_atmos"
item_state = "nt_atmos"
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
siemens_coefficient = 0.75
@@ -36,7 +34,6 @@
icon = 'icons/obj/item/clothing/department_uniforms/engineering.dmi'
icon_state = "nt_engineer"
item_state = "nt_engineer"
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
armor = list(
rad = ARMOR_RAD_MINOR
code/modules/clothing/under/jobs/medsci.dm
-6
View File
@@ -7,7 +7,6 @@
icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
icon_state = "research_director"
item_state = "research_director"
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
armor = list(
bio = ARMOR_BIO_MINOR
@@ -24,7 +23,6 @@
armor = list(
bio = ARMOR_BIO_MINOR
)
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
/obj/item/clothing/under/rank/scientist/zeng
@@ -109,7 +107,6 @@
icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
icon_state = "chief_medical_officer"
item_state = "chief_medical_officer"
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
permeability_coefficient = 0.50
armor = list(
@@ -122,7 +119,6 @@
icon = 'icons/clothing/under/uniforms/iac_uniform.dmi'
icon_state = "iac"
item_state = "iac"
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
permeability_coefficient = 0.50
armor = list(
@@ -137,7 +133,6 @@
icon = 'icons/obj/item/clothing/department_uniforms/medical.dmi'
icon_state = "nt_phys"
item_state = "nt_phys"
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
permeability_coefficient = 0.50
armor = list(
@@ -216,7 +211,6 @@
desc = "It's made of a special fiber that provides minor protection against biohazards. Specially fitted to ensure surgical precision."
icon_state = "nt_surgeon"
item_state = "nt_surgeon"
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
/obj/item/clothing/under/rank/medical/surgeon/zeng
code/modules/clothing/under/jobs/security.dm
-6
View File
@@ -19,7 +19,6 @@
melee = ARMOR_MELEE_SMALL
)
siemens_coefficient = 0.75
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
/obj/item/clothing/under/rank/security/zavod
@@ -84,7 +83,6 @@
melee = ARMOR_MELEE_SMALL
)
siemens_coefficient = 0.75
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
/obj/item/clothing/under/rank/cadet/zavod
@@ -108,7 +106,6 @@
icon = 'icons/clothing/under/uniforms/cyclops_uniforms.dmi'
icon_state = "heph_security"
item_state = "heph_security"
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
/obj/item/clothing/under/rank/warden
@@ -121,7 +118,6 @@
melee = ARMOR_MELEE_SMALL
)
siemens_coefficient = 0.75
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
/obj/item/clothing/under/rank/warden/remote
@@ -162,7 +158,6 @@
melee = ARMOR_MELEE_SMALL
)
siemens_coefficient = 0.75
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
/obj/item/clothing/under/det/zavod
@@ -205,7 +200,6 @@
icon = 'icons/obj/item/clothing/department_uniforms/command.dmi'
icon_state = "head_of_security"
item_state = "head_of_security"
has_sensor = SUIT_HAS_SENSORS
contained_sprite = TRUE
armor = list(
melee = ARMOR_MELEE_SMALL
code/modules/clothing/under/syndicate.dm
+1 -2
View File
@@ -4,7 +4,7 @@
icon_state = "syndicate"
item_state = "bl_suit"
worn_state = "syndicate"
has_sensor = 0
has_sensor = SUIT_NO_SENSORS
armor = list(
melee = ARMOR_MELEE_MINOR
)
@@ -20,7 +20,6 @@
item_state = "bl_suit"
worn_state = "tactifool"
siemens_coefficient = 1
has_sensor = SUIT_HAS_SENSORS
armor = null
/obj/item/clothing/under/syndicate/tracksuit