Merge pull request #6758 from FlattestGuitar/outfiterinos

Touches up the admin outfits. 🤳
This commit is contained in:
Fox McCloud
2017-03-26 18:15:55 -04:00
committed by GitHub
11 changed files with 831 additions and 682 deletions
+1 -1
View File
@@ -249,7 +249,7 @@ obj/item/clothing/head/blob
desc = "A set of armor worn by medical members of the NanoTrasen Emergency Response Team. Has red and white highlights."
icon_state = "erthelmet_med"
//Medical
//Janitorial
/obj/item/clothing/head/helmet/ert/janitor
name = "emergency response team janitor helmet"
desc = "A set of armor worn by janitorial members of the NanoTrasen Emergency Response Team. Has red and white highlights."
+12
View File
@@ -106,3 +106,15 @@
desc = "It's baseball hat in corpotate colours."
icon_state = "corpsoft"
item_color = "corp"
/obj/item/clothing/head/soft/solgov
name = "Sol Federation marine cap"
desc = "A soft cap worn by marines of the Sol Federation."
icon_state = "solgovsoft"
item_color = "solgov"
/obj/item/clothing/head/soft/solgov/command
name = "Sol Federation Lieutenant's cap"
desc = "A soft cap worn by marines of the Sol Federation. The insignia signifies the wearer bears the rank of a Lieutenant."
icon_state = "solgovcsoft"
item_color = "solgovc"
@@ -76,6 +76,7 @@
desc = "An armored beret commonly used by special operations officers."
icon_state = "beret_officer"
armor = list(melee = 65, bullet = 55, laser = 35, energy = 20, bomb = 30, bio = 30, rad = 30)
flags = HEADCOVERSEYES | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL //idfk
/obj/item/clothing/suit/space/deathsquad/officer
name = "officer jacket"
@@ -67,6 +67,27 @@
item_state = "gy_suit"
item_color = "vice"
/obj/item/clothing/under/solgov
name = "Sol Federation marine uniform"
desc = "A comfortable and durable combat uniform worn by Sol Federation Marine Forces."
icon_state = "solgov"
item_state = "ro_suit"
item_color = "solgov"
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
displays_id = 0
/obj/item/clothing/under/solgov/command
name = "Sol Federation Lieutenant's uniform"
desc = "A comfortable and durable combat uniform worn by Sol Federation Marine Forces. This one has additional insignia on its shoulders."
icon_state = "solgovc"
item_color = "solgovc"
/obj/item/clothing/under/solgov/rep
name = "Sol Federation representative's uniform"
desc = "A formal uniform worn by the diplomatic representatives of the Sol Federation."
icon_state = "solgovr"
item_color = "solgovr"
/obj/item/clothing/under/rank/centcom_officer
desc = "It's a jumpsuit worn by CentComm Officers."
name = "\improper CentComm officer's jumpsuit"