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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum

Browse Source 
# Conflicts:
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/suits.dmi
This commit is contained in:
zerothebigboy
2021-02-19 09:07:27 -05:00
parent 7b227e5d3e d2f9237ecd
commit d0beec1364
96 changed files with 3664 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/miscellaneous.dm
+5 -1
View File
@@ -487,13 +487,17 @@
item_state = "militaryjacket"
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/radio)
/obj/item/clothing/suit/jacket/urbanjacket
/obj/item/clothing/suit/jacket/urbanjacket/polychromic
name = "urban jacket"
desc = "A canvas jacket styled with a fur neck piece, stylish."
icon_state = "urbanjacket"
item_state = "urbanjacket"
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/radio)
/obj/item/clothing/suit/jacket/urbanjacket/polychromic/ComponentInitialize()
. = ..()
AddElement(/datum/element/polychromic, list("#26321D", "#CBBDAF", "#292929"), 3)
/obj/item/clothing/suit/jacket/letterman
name = "letterman jacket"
desc = "A classic brown letterman jacket. Looks pretty hot and heavy."
code/modules/clothing/under/pants.dm
+11
View File
@@ -46,6 +46,17 @@
desc = "Some tan pants. You look like a white collar worker with these on."
icon_state = "tanpants"
/obj/item/clothing/under/pants/polypants/polychromic
name = "polychromic pants"
desc = "Some stylish pair of pants made from polychrome."
icon_state = "polypants"
item_state = "polypants"
var/list/poly_colors = list("#75634F", "#3D3D3D", "#575757")
/obj/item/clothing/under/pants/polypants/polychromic/ComponentInitialize()
. = ..()
AddElement(/datum/element/polychromic, poly_colors, 3)
/obj/item/clothing/under/pants/track
name = "track pants"
desc = "A pair of track pants, for the athletic."