diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 8666269d77a..d9cc65c0176 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -854,7 +854,7 @@ /obj/item/clothing/glasses/monocle =1,/obj/item/clothing/head/bowlerhat = 1,/obj/item/weapon/cane = 1,/obj/item/clothing/under/sl_suit = 1, /obj/item/clothing/mask/fakemoustache = 1,/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,/obj/item/clothing/head/plaguedoctorhat = 1,/obj/item/clothing/mask/gas/plaguedoctor = 1, /obj/item/clothing/under/owl = 1,/obj/item/clothing/mask/gas/owl_mask = 1,/obj/item/clothing/suit/apron = 1,/obj/item/clothing/under/waiter = 1, - /obj/item/clothing/under/pirate = 1,/obj/item/clothing/suit/pirate = 1,/obj/item/clothing/head/pirate = 1,/obj/item/clothing/head/bandana = 1, + /obj/item/clothing/under/pirate = 1,/obj/item/clothing/suit/pirate_black = 1,/obj/item/clothing/under/pirate_rags = 1,/obj/item/clothing/suit/pirate_brown = 1,/obj/item/clothing/head/pirate = 1,/obj/item/clothing/head/bandana = 1, /obj/item/clothing/head/bandana = 1,/obj/item/clothing/under/soviet = 1,/obj/item/clothing/head/ushanka = 1,/obj/item/clothing/suit/imperium_monk = 1, /obj/item/clothing/mask/gas/cyborg = 1,/obj/item/clothing/suit/holidaypriest = 1,/obj/item/clothing/head/wizard/marisa/fake = 1, /obj/item/clothing/suit/wizrobe/marisa/fake = 1,/obj/item/clothing/under/sundress = 1,/obj/item/clothing/head/witchwig = 1,/obj/item/weapon/staff/broom = 1, diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index c8119105a70..7c1aedbdf04 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -208,7 +208,7 @@ /obj/effect/landmark/costume/pirate/New() new /obj/item/clothing/under/pirate(src.loc) - new /obj/item/clothing/suit/pirate(src.loc) + new /obj/item/clothing/suit/pirate_black(src.loc) var/CHOICE = pick( /obj/item/clothing/head/pirate , /obj/item/clothing/head/bandana ) new CHOICE(src.loc) new /obj/item/clothing/glasses/eyepatch(src.loc) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 6461a41c688..fbfb77cdc9d 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -31,8 +31,15 @@ /* * Costume */ -/obj/item/clothing/suit/pirate - name = "pirate coat" +/obj/item/clothing/suit/pirate_brown + name = "brown pirate coat" + desc = "Yarr." + icon_state = "pirate_old" + item_state = "pirate_old" + flags = FPRINT | TABLEPASS + +/obj/item/clothing/suit/pirate_black + name = "black pirate coat" desc = "Yarr." icon_state = "pirate" item_state = "pirate" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 224db81235a..b7f144b84d8 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -210,6 +210,13 @@ item_state = "pirate" _color = "pirate" +/obj/item/clothing/under/pirate_rags + name = "pirate rags" + desc = "an old ragged set of clothing" + icon_state = "piraterags" + item_state = "piraterags" + _color = "piraterags" + /obj/item/clothing/under/soviet name = "soviet uniform" desc = "For the Motherland!" diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 8c7561f7d71..c5d918bdbb0 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -142,7 +142,7 @@ /obj/effect/landmark/mobcorpse/pirate/ranged name = "Pirate Gunner" - corpsesuit = /obj/item/clothing/suit/pirate + corpsesuit = /obj/item/clothing/suit/pirate_black corpsehelmet = /obj/item/clothing/head/pirate diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index fd2a3fe01b8..0bb0f00c80f 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index e0579a0a894..25d900dbc04 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index c0ec9f35d07..02b14827104 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 202f65bcd5f..e2db6fa8f03 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ