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

Adds a (mostly) cosmetic flak jacket and helmet (#7045)

Browse Source
This commit is contained in:
Michiyamenotehifunana
2018-06-11 03:31:54 +08:00
committed by kevinz000
parent 2a727c6df2
commit a6966e2a97
7 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/client/loadout/head.dm
+6
View File
@@ -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"
modular_citadel/code/modules/client/loadout/suit.dm
+6
View File
@@ -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
modular_citadel/code/modules/clothing/head/head.dm
+14
View File
@@ -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."
modular_citadel/code/modules/clothing/suits/suits.dm
+13 -1
View File
@@ -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
modular_citadel/icons/mob/clothing/space_nam.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 653 B

modular_citadel/icons/obj/clothing/space_nam.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 591 B

tgstation.dme
+1
View File
@@ -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"