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

Merge branch 'master' into upstream-merge-32188

Browse Source
This commit is contained in:
deathride58
2017-11-18 05:31:42 +00:00
committed by GitHub
parent bc1f65b381 9e78bcd8f9
commit eeba86e27e
109 changed files with 452 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/miscellaneous.dm
+6
View File
@@ -80,6 +80,12 @@
item_state = "overalls"
body_parts_covered = CHEST|GROIN|LEGS
/obj/item/clothing/suit/apron/purple_bartender
name = "purple bartender apron"
desc = "A fancy purple apron for a stylish person."
icon_state = "purplebartenderapron"
item_state = "purplebartenderapron"
body_parts_covered = CHEST|GROIN|LEGS
/obj/item/clothing/suit/syndicatefake
name = "black and red space suit replica"
code/modules/clothing/under/jobs/civilian.dm
+7
View File
@@ -8,6 +8,13 @@
item_color = "barman"
alt_covers_chest = 1
/obj/item/clothing/under/rank/bartender/purple
desc = "It looks like it has lots of flair!"
name = "purple bartender's uniform"
icon_state = "purplebartender"
item_state = "purplebartender"
alt_covers_chest = 1
/obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
name = "captain's jumpsuit"