shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrects Plasmamen sec jumpsuits not starting with MAXIUM tracking (#11747)

Browse Source 
* Update security.dm

* Update civilian_service.dm

* why is their so many more lines of the same code here?

* Update rnd.dm

* clears up sec file so that they all use a base

* Update curator.dm
This commit is contained in:
Trilbyspaceclone
2020-04-06 11:53:43 -04:00
committed by GitHub
parent ee1cb5f8c5
commit faf199fc35
5 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm
+3 -2
View File
@@ -12,7 +12,6 @@
item_state = "explorer_envirosuit"
item_color = "explorer_envirosuit"
/obj/item/clothing/under/plasmaman/chef
name = "chef's plasma envirosuit"
desc = "A white plasmaman envirosuit designed for cullinary practices. One might question why a member of a species that doesn't need to eat would become a chef."
@@ -69,6 +68,8 @@
item_state = "captain_envirosuit"
item_color = "captain_envirosuit"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95)
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
/obj/item/clothing/under/plasmaman/mime
name = "mime envirosuit"
@@ -97,4 +98,4 @@
H.visible_message("<span class='warning'>[H]'s suit spews out a tonne of space lube!</span>","<span class='warning'>Your suit spews out a tonne of space lube!</span>")
H.ExtinguishMob()
new /obj/effect/particle_effect/foam(loc) //Truely terrifying.
return FALSE
return FALSE
code/modules/clothing/under/jobs/Plasmaman/security.dm
+2
View File
@@ -5,6 +5,8 @@
item_state = "security_envirosuit"
item_color = "security_envirosuit"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95)
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
/obj/item/clothing/under/plasmaman/security/warden
name = "warden plasma envirosuit"
code/modules/clothing/under/jobs/civilian/curator.dm
-2
View File
@@ -13,7 +13,6 @@
item_state = "red_suit"
item_color = "red_suit_skirt"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/civilian/curator/treasure_hunter
@@ -37,5 +36,4 @@
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
can_adjust = FALSE
resistance_flags = NONE
code/modules/clothing/under/jobs/rnd.dm
-1
View File
@@ -14,7 +14,6 @@
item_state = "lb_suit"
item_color = "director_skirt"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/rnd/research_director/alt
code/modules/clothing/under/jobs/security.dm
+5 -18
View File
@@ -8,6 +8,11 @@
/*
* Security
*/
/obj/item/clothing/under/rank/security
strip_delay = 50
alt_covers_chest = TRUE
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
/obj/item/clothing/under/rank/security/officer
name = "security jumpsuit"
@@ -16,10 +21,6 @@
item_state = "r_suit"
item_color = "rsecurity"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
strip_delay = 50
alt_covers_chest = TRUE
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
/obj/item/clothing/under/rank/security/officer/grey
name = "grey security jumpsuit"
@@ -73,10 +74,6 @@
item_state = "r_suit"
item_color = "rwarden"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
strip_delay = 50
alt_covers_chest = TRUE
sensor_mode = 3
random_sensor = FALSE
/obj/item/clothing/under/rank/security/warden/grey
name = "grey security suit"
@@ -114,10 +111,6 @@
item_state = "det"
item_color = "detective"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
strip_delay = 50
alt_covers_chest = TRUE
sensor_mode = 3
random_sensor = FALSE
/obj/item/clothing/under/rank/security/detective/skirt
name = "detective's suitskirt"
@@ -135,7 +128,6 @@
icon_state = "greydet"
item_state = "greydet"
item_color = "greydet"
alt_covers_chest = TRUE
/obj/item/clothing/under/rank/security/detective/grey/skirt
name = "noir suitskirt"
@@ -159,9 +151,6 @@
item_color = "rhos"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
strip_delay = 60
alt_covers_chest = TRUE
sensor_mode = 3
random_sensor = FALSE
/obj/item/clothing/under/rank/security/head_of_security/skirt
name = "head of security's jumpskirt"
@@ -203,7 +192,6 @@
icon_state = "hosblueclothes"
item_state = "hosblueclothes"
item_color = "hosblueclothes"
alt_covers_chest = TRUE
/obj/item/clothing/under/rank/security/head_of_security/parade
name = "head of security's parade uniform"
@@ -220,4 +208,3 @@
item_state = "r_suit"
item_color = "hos_parade_fem"
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE