Merge pull request #65 from EmeraldSundisk/Citadel-Station-13-master

Citadel station 13 master
This commit is contained in:
EmeraldSundisk
2020-09-27 10:09:12 -07:00
committed by GitHub
75 changed files with 534 additions and 228 deletions
+2 -2
View File
@@ -373,7 +373,7 @@
/obj/item/clothing/glasses/sunglasses/blindfold/white/update_icon(mob/living/carbon/human/user)
if(ishuman(user) && !colored_before)
add_atom_colour("#[user.eye_color]", FIXED_COLOUR_PRIORITY)
add_atom_colour("#[user.left_eye_color]", FIXED_COLOUR_PRIORITY)
colored_before = TRUE
/obj/item/clothing/glasses/sunglasses/blindfold/white/worn_overlays(isinhands = FALSE, icon_file, used_state, style_flags = NONE)
@@ -382,7 +382,7 @@
var/mob/living/carbon/human/H = loc
var/mutable_appearance/M = mutable_appearance('icons/mob/clothing/eyes.dmi', "blindfoldwhite")
M.appearance_flags |= RESET_COLOR
M.color = "#[H.eye_color]"
M.color = "#[H.left_eye_color]"
. += M
/obj/item/clothing/glasses/sunglasses/big
@@ -45,10 +45,18 @@
/obj/item/clothing/under/rank/engineering/engineer/hazard
name = "engineer's hazard jumpsuit"
desc = "A high visibility jumpsuit made from heat and radiation resistant materials."
icon_state = "hazard"
item_state = "suit-orange"
icon_state = "hazard_orange"
item_state = "engi_suit"
alt_covers_chest = TRUE
/obj/item/clothing/under/rank/engineering/engineer/hazard/green
icon_state = "hazard_green"
item_state = "g_suit"
/obj/item/clothing/under/rank/engineering/engineer/hazard/white
icon_state = "hazard_white"
item_state = "gy_suit"
/obj/item/clothing/under/rank/engineering/engineer/skirt
name = "engineer's jumpskirt"
desc = "It's an orange high visibility jumpskirt worn by engineers."