diff --git a/code/datums/outfits/costumes/halloween.dm b/code/datums/outfits/costumes/halloween.dm index a731151a005..6c650c723b5 100644 --- a/code/datums/outfits/costumes/halloween.dm +++ b/code/datums/outfits/costumes/halloween.dm @@ -118,4 +118,12 @@ shoes = /obj/item/clothing/shoes/white suit = /obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout gloves = /obj/item/clothing/gloves/white - mask = /obj/item/clothing/mask/surgical \ No newline at end of file + mask = /obj/item/clothing/mask/surgical + +/decl/hierarchy/outfit/costume/marine + name = OUTFIT_COSTUME("Ruin Marine") + uniform = /obj/item/clothing/under/color/grey + shoes = /obj/item/clothing/shoes/brown + head = /obj/item/clothing/head/marine + suit = /obj/item/clothing/suit/marine + r_hand = /obj/item/weapon/gun/projectile/revolver/toy/sawnoff \ No newline at end of file diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 0351e16fcaf..e2362abb278 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -529,4 +529,12 @@ /obj/item/clothing/head/wheat name = "straw hat" desc = "It's a hat made from synthetic straw. Brought to you by \"Country Girls LLC.\" the choice brand for the galaxy's working class." - icon_state = "wheat" \ No newline at end of file + icon_state = "wheat" + +//Ruin Marine (Doom Marine) +/obj/item/clothing/head/marine + name = "marine helmet" + desc = "A marine helmet prop from the popular game 'Ruin'." + icon_state = "marine" + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR + body_parts_covered = HEAD|FACE|EYES \ No newline at end of file diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 3d44c893fe1..cee3fcec328 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -984,4 +984,13 @@ src.icon_state = "caution" src.item_state = "caution" usr.show_message("You turn the wet floor sign off.") - update_clothing_icon() \ No newline at end of file + update_clothing_icon() + +//Ruin Marine (Doom Marine) +/obj/item/clothing/suit/marine + name = "marine armor" + desc = "A set of marine prop armor from the popular game 'Ruin'." + icon_state = "marine" + body_parts_covered = FEET|LOWER_TORSO|UPPER_TORSO|LEGS + flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER + item_state_slots = list(slot_r_hand_str = "green_labcoat", slot_l_hand_str = "green_labcoat") \ No newline at end of file diff --git a/icons/inventory/head/item.dmi b/icons/inventory/head/item.dmi index bfdea47a734..31d2a38cc53 100644 Binary files a/icons/inventory/head/item.dmi and b/icons/inventory/head/item.dmi differ diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi index 17728e25f67..6289d6b9d4f 100644 Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index 4e8e3f86576..659401d5a6a 100644 Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index 9aa489853fb..36e91cbcf15 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ