Merge pull request #1284 from Mark9013100/3/29/2016mapfixes

Map fixes, minor edits
This commit is contained in:
Neerti
2016-03-30 02:25:35 -04:00
8 changed files with 135 additions and 129 deletions
+4 -4
View File
@@ -67,7 +67,7 @@
icon_state = "beret_navy_officer"
/obj/item/clothing/head/beret/sec/navy/hos
name = "officer beret"
desc = "A navy blue beret with a commander's rank emblem. For officers that are more inclined towards style than safety."
desc = "A navy blue beret with a head of security's rank emblem. For officers that are more inclined towards style than safety."
icon_state = "beret_navy_hos"
/obj/item/clothing/head/beret/sec/navy/warden
name = "warden beret"
@@ -79,7 +79,7 @@
icon_state = "beret_corporate_officer"
/obj/item/clothing/head/beret/sec/corporate/hos
name = "officer beret"
desc = "A corporate black beret with a commander's rank emblem. For officers that are more inclined towards style than safety."
desc = "A corporate black beret with a head of security's rank emblem. For officers that are more inclined towards style than safety."
icon_state = "beret_corporate_hos"
/obj/item/clothing/head/beret/sec/corporate/warden
name = "warden beret"
@@ -95,11 +95,11 @@
icon_state = "beret_purple"
/obj/item/clothing/head/beret/centcom/officer
name = "officers beret"
desc = "A black beret adorned with the shield - a silver kite shield with an engraved sword - of the corporate security forces."
desc = "A dark blue beret adorned with a silver patch. Worn by NanoTrasen Officials."
icon_state = "beret_centcom_officer"
/obj/item/clothing/head/beret/centcom/captain
name = "captains beret"
desc = "A white beret adorned with the shield - a silver kite shield with an engraved sword - of the corporate security forces."
desc = "A white beret adorned with a blue patch. Worn by NanoTrasen command staff."
icon_state = "beret_centcom_captain"
//Medical
+11 -11
View File
@@ -80,7 +80,7 @@
/obj/item/clothing/under/lightblue
name = "lightblue jumpsuit"
desc = "lightblue"
desc = "A light blue jumpsuit."
icon_state = "lightblue"
item_state = "b_suit"
worn_state = "lightblue"
@@ -88,7 +88,7 @@
/obj/item/clothing/under/aqua
name = "aqua jumpsuit"
desc = "aqua"
desc = "An aqua jumpsuit."
icon_state = "aqua"
item_state = "b_suit"
worn_state = "aqua"
@@ -96,7 +96,7 @@
/obj/item/clothing/under/purple
name = "purple jumpsuit"
desc = "purple"
desc = "A purple jumpsuit."
icon_state = "purple"
item_state = "p_suit"
worn_state = "purple"
@@ -104,7 +104,7 @@
/obj/item/clothing/under/lightpurple
name = "lightpurple jumpsuit"
desc = "lightpurple"
desc = "A light purple jumpsuit."
icon_state = "lightpurple"
item_state = "p_suit"
worn_state = "lightpurple"
@@ -112,7 +112,7 @@
/obj/item/clothing/under/lightgreen
name = "lightgreen jumpsuit"
desc = "lightgreen"
desc = "A light green jumpsuit."
icon_state = "lightgreen"
item_state = "g_suit"
worn_state = "lightgreen"
@@ -120,7 +120,7 @@
/obj/item/clothing/under/lightbrown
name = "lightbrown jumpsuit"
desc = "lightbrown"
desc = "A light brown jumpsuit."
icon_state = "lightbrown"
item_state = "lb_suit"
worn_state = "lightbrown"
@@ -128,7 +128,7 @@
/obj/item/clothing/under/brown
name = "brown jumpsuit"
desc = "brown"
desc = "A brown jumpsuit."
icon_state = "brown"
item_state = "lb_suit"
worn_state = "brown"
@@ -136,7 +136,7 @@
/obj/item/clothing/under/yellowgreen
name = "yellowgreen jumpsuit"
desc = "yellowgreen"
desc = "A... yellow green jumpsuit?"
icon_state = "yellowgreen"
item_state = "y_suit"
worn_state = "yellowgreen"
@@ -144,7 +144,7 @@
/obj/item/clothing/under/darkblue
name = "darkblue jumpsuit"
desc = "darkblue"
desc = "A dark blue jumpsuit."
icon_state = "darkblue"
item_state = "b_suit"
worn_state = "darkblue"
@@ -152,7 +152,7 @@
/obj/item/clothing/under/lightred
name = "lightred jumpsuit"
desc = "lightred"
desc = "A light red jumpsuit."
icon_state = "lightred"
item_state = "r_suit"
worn_state = "lightred"
@@ -160,7 +160,7 @@
/obj/item/clothing/under/darkred
name = "darkred jumpsuit"
desc = "darkred"
desc = "A dark red jumpsuit."
icon_state = "darkred"
item_state = "r_suit"
worn_state = "darkred"
+2 -2
View File
@@ -141,8 +141,8 @@
item_state = "johnny"
/obj/item/clothing/under/rainbow
name = "rainbow"
desc = "rainbow"
name = "rainbow jumpsuit"
desc = "A multi-colored jumpsuit."
icon_state = "rainbow"
item_state = "rainbow"
worn_state = "rainbow"