Merge pull request #1858 from killer653/master

Adds more jackets to the loadout menu.
This commit is contained in:
Spades
2017-07-17 21:30:34 -04:00
committed by GitHub
3 changed files with 89 additions and 1 deletions
@@ -4,4 +4,16 @@
/datum/gear/suit/labcoat_colorable/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/suit/jacket_modular
display_name = "jacket, modular"
path = /obj/item/clothing/suit/storage/fluff/jacket
/datum/gear/suit/jacket_modular/New()
..()
var/list/the_jackets = list()
for(var/the_jacket in typesof(/obj/item/clothing/suit/storage/fluff/jacket))
var/obj/item/clothing/suit/jacket_type = the_jacket
the_jackets[initial(jacket_type.name)] = jacket_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(the_jackets))
@@ -1590,3 +1590,79 @@ Departamental Swimsuits, for general use
name = "purple and grey cloak"
icon_state = "tesh_cloak_brg"
item_state = "tesh_cloak_brg"
//Jackets For General Use. Sprited by Joji.
/obj/item/clothing/suit/storage/fluff/jacket //Not the toggle version since it uses custom toggle code to update the on-mob icon.
name = "Field Jacket"
desc = "A standard Earth military field jacket made of comfortable cotton."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "fjacket"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "fjacket_mob"
var/unbuttoned = 0
verb/toggle()
set name = "Toggle coat buttons"
set category = "Object"
set src in usr
if(!usr.canmove || usr.stat || usr.restrained())
return 0
switch(unbuttoned)
if(0)
icon_state = "[initial(icon_state)]_open"
item_state = "[initial(item_state)]_open"
unbuttoned = 1
usr << "You unbutton the coat."
if(1)
icon_state = "[initial(icon_state)]"
item_state = "[initial(item_state)]"
unbuttoned = 0
usr << "You button up the coat."
usr.update_inv_wear_suit()
/obj/item/clothing/suit/storage/fluff/jacket/field //Just here so it can be seen and easily recognized under /spawn.
name = "Field Jacket"
/obj/item/clothing/suit/storage/fluff/jacket/air_cavalry
name = "Air Cavalry Jacket"
desc = "A jacket worn by the 1st Cavalry Division on Earth."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "acjacket"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "acjacket_mob"
/obj/item/clothing/suit/storage/fluff/jacket/air_force
name = "Air Force Jacket"
desc = "A jacket worn by the Earth Air Force."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "afjacket"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "afjacket_mob"
/obj/item/clothing/suit/storage/fluff/jacket/navy
name = "Navy Jacket"
desc = "A jacket worn by the Earth's Navy. It's adorned with reflective straps."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "navyjacket"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "navyjacket_mob"
/obj/item/clothing/suit/storage/fluff/jacket/special_forces
name = "Special Forces Jacket"
desc = "A durable jacket worn by the Earth's special forces."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "sfjacket"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "sfjacket_mob"