From a6966e2a97eb59cc82868ba7faa5b55b37b5c544 Mon Sep 17 00:00:00 2001 From: Michiyamenotehifunana <31995558+Michiyamenotehifunana@users.noreply.github.com> Date: Mon, 11 Jun 2018 03:31:54 +0800 Subject: [PATCH] Adds a (mostly) cosmetic flak jacket and helmet (#7045) --- .../code/modules/client/loadout/head.dm | 6 ++++++ .../code/modules/client/loadout/suit.dm | 6 ++++++ .../code/modules/clothing/head/head.dm | 14 ++++++++++++++ .../code/modules/clothing/suits/suits.dm | 14 +++++++++++++- modular_citadel/icons/mob/clothing/space_nam.dmi | Bin 0 -> 653 bytes modular_citadel/icons/obj/clothing/space_nam.dmi | Bin 0 -> 591 bytes tgstation.dme | 1 + 7 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 modular_citadel/code/modules/clothing/head/head.dm create mode 100644 modular_citadel/icons/mob/clothing/space_nam.dmi create mode 100644 modular_citadel/icons/obj/clothing/space_nam.dmi diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 45bf7a3058..1ef203d538 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -48,6 +48,12 @@ category = SLOT_HEAD path = /obj/item/clothing/head/that +/datum/gear/flakhelm + name = "Flak Helmet" + category = SLOT_HEAD + path = /obj/item/clothing/head/flakhelm + cost = 2 + //trek fancy Hats! /datum/gear/trekcap name = "Federation Officer's Cap" diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index 1e1610ae75..9d3a6b9a02 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -74,6 +74,12 @@ category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/ianshirt +/datum/gear/flakjack + name = "Flak Jacket" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/flakjack + cost = 2 + /datum/gear/trekds9_coat name = "DS9 Overcoat (use uniform)" category = SLOT_WEAR_SUIT diff --git a/modular_citadel/code/modules/clothing/head/head.dm b/modular_citadel/code/modules/clothing/head/head.dm new file mode 100644 index 0000000000..03b092d038 --- /dev/null +++ b/modular_citadel/code/modules/clothing/head/head.dm @@ -0,0 +1,14 @@ +/*///////////////////////////////////////////////////////////////////////////////// +/////// /////// +/////// Cit's exclusive hats, helmets, etc. go here /////// +/////// /////// +*////////////////////////////////////////////////////////////////////////////////// + +/obj/item/clothing/head/flakhelm + name = "flak helmet" + icon = 'modular_citadel/icons/obj/clothing/space_nam.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/clothing/space_nam.dmi' + icon_state = "m1helm" + item_state = "helmet" + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0.1, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = -1) + desc = "A dilapidated helmet used in ancient wars. This one is brittle and essentially useless. An ace of spades is tucked into the band around the outer shell." \ No newline at end of file diff --git a/modular_citadel/code/modules/clothing/suits/suits.dm b/modular_citadel/code/modules/clothing/suits/suits.dm index 60b951bdb4..8d7de7be01 100644 --- a/modular_citadel/code/modules/clothing/suits/suits.dm +++ b/modular_citadel/code/modules/clothing/suits/suits.dm @@ -11,7 +11,7 @@ alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' icon_state = "hostrench" item_state = "hostrench" - + /obj/item/clothing/suit/hooded/cloak/david name = "red cloak" icon_state = "goliath_cloak" @@ -24,3 +24,15 @@ icon_state = "golhood" desc = "conceal your face in shame with this nanotrasen brand hood" flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR + +/obj/item/clothing/suit/flakjack + name = "flak jacket" + desc = "A dilapidated jacket made of a supposedly bullet-proof material (Hint: It isn't.). Smells faintly of napalm." + icon = 'modular_citadel/icons/obj/clothing/space_nam.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/clothing/space_nam.dmi' + icon_state = "flakjack" + item_state = "redtag" + blood_overlay_type = "armor" + body_parts_covered = CHEST + resistance_flags = NONE + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 5, "bio" = 0, "rad" = 0, "fire" = -5, "acid" = -15) //nylon sucks against acid \ No newline at end of file diff --git a/modular_citadel/icons/mob/clothing/space_nam.dmi b/modular_citadel/icons/mob/clothing/space_nam.dmi new file mode 100644 index 0000000000000000000000000000000000000000..05eb00a3466adb49ab11bc16731bc6fd06d356fd GIT binary patch literal 653 zcmV;80&@L{P)fFDZ*Bkpc$`yK zaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+ z*DxbBCs&D!GbOXA7^I7fGp#5wHx;M1(cS%G+RA_<_I85~a|J6AONS#zWRnke*=C3V%IC2N!`t{>-1rSe|mt|eoWtl~tMgFOJ2q8)V zVRjCjn}euV6rJ58n>^NIjKEt2{4eR{0%ScuVnFHo4Z|=D!!V3LMXTQr`*S_l`u(s! z0HFWDgvjMy8vsTr)jR}w0C)ii`7sLvfbk!oyW=C$-LZ?5y-7Am6A_IB5GPQQ?|>+! zM6%vw4sq#hG7`5Vc+T2I_F0F-s@j_x6;n1b2#WM=y+Ht%TKZIRaTu$ z@(dvRALYMqh$&lJ3a%1Rn`z%ur~!EfkOPk4pf8}b;xYrs0mpFASDeL_t(YiS3hNZ-XEZhGlY|6pB?V`~UxRFUPD7XqM4^?3)-9;`4BK zVAs9#uThd0@DE9&V#iw*g7=aph1%&uQU6eD{X3r=H3R8k7&H~@9P#mp7>p_Ti>86} zr7*DY)}9^idMylu-3e9X0+!wVG@T6Yb~Qa`w}NQaq-QDw!Y|W0`Gdc?zGsZ){2?YV z>lstX1q!@fmg&A5B0r9dVepwJj8LA;umz=}017dvO44>;_z2L(C z#38`pq5||)5rp8aUGM9TM?UKmmk1^3SU^<(gFEmFpIV?NEd;>M7~^dGqj7#EF9wn) zTi?E6gIDC4Ro?!i2}!Z;66}KaAplof6@MOqV;Bix`ztR~-~>0}xQmGe+=R<9Y^`uI dyuiNGbzd*w6D<*L#=-yq002ovPDHLkV1k{l{mcLW literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index 8ab9d64ce1..527db71b8c 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2773,6 +2773,7 @@ #include "modular_citadel\code\modules\client\verbs\who.dm" #include "modular_citadel\code\modules\clothing\clothing.dm" #include "modular_citadel\code\modules\clothing\glasses\phantomthief.dm" +#include "modular_citadel\code\modules\clothing\head\head.dm" #include "modular_citadel\code\modules\clothing\spacesuits\flightsuit.dm" #include "modular_citadel\code\modules\clothing\suits\polychromic_cloaks.dm" #include "modular_citadel\code\modules\clothing\suits\suits.dm"