mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 08:08:49 +01:00
Merge pull request #10952 from phil235/BartenderSecPhotoFix
Fixes bartender uniform not appearing in security record photo.
This commit is contained in:
@@ -370,7 +370,7 @@ var/record_id_num = 1001
|
||||
clothes_s.Blend(icon('icons/mob/mask.dmi', "mime"), ICON_OVERLAY)
|
||||
clothes_s.Blend(icon('icons/mob/suit.dmi', "suspenders"), ICON_OVERLAY)
|
||||
if("Bartender")
|
||||
clothes_s = icon('icons/mob/uniform.dmi', "ba_suit_s")
|
||||
clothes_s = icon('icons/mob/uniform.dmi', "barman_s")
|
||||
clothes_s.Blend(icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
|
||||
clothes_s.Blend(icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY)
|
||||
if("Quartermaster")
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
/obj/item/clothing/under/rank/bartender
|
||||
desc = "It looks like it could use some more flair."
|
||||
name = "bartender's uniform"
|
||||
icon_state = "bar_suit"
|
||||
icon_state = "barman"
|
||||
item_state = "bar_suit"
|
||||
item_color = "bar_suit"
|
||||
item_color = "barman"
|
||||
|
||||
|
||||
/obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
|
||||
|
||||
@@ -163,7 +163,7 @@
|
||||
else if(backbag == 2)
|
||||
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
|
||||
if(BARTENDER)
|
||||
clothes_s = new /icon('icons/mob/uniform.dmi', "bar_suit_s")
|
||||
clothes_s = new /icon('icons/mob/uniform.dmi', "barman_s")
|
||||
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_OVERLAY)
|
||||
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY)
|
||||
if(backbag == 1)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 203 KiB After Width: | Height: | Size: 203 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 46 KiB |
Reference in New Issue
Block a user