cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Brings the jumpsuits, pants, shorts, ponchos and hoodies under the path system.

Browse Source
This commit is contained in:
Datraen
2016-04-05 14:44:31 -04:00
parent 48b773fcfa
commit e1c0256477
12 changed files with 65 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
code/modules/client/preference_setup/loadout/loadout_suit.dm
View File

@@ -59,48 +59,16 @@
path = /obj/item/clothing/suit/storage/hazardvest
/datum/gear/suit/hoodie
display_name = "hoodie, grey"
display_name = "hoodie"
path = /obj/item/clothing/suit/storage/toggle/hoodie
/datum/gear/suit/hoodie/red
display_name = "hoodie, red"
path = /obj/item/clothing/suit/storage/toggle/hoodie/red
/datum/gear/suit/hoodie/blue
display_name = "hoodie, blue"
path = /obj/item/clothing/suit/storage/toggle/hoodie/blue
/datum/gear/suit/hoodie/yellow
display_name = "hoodie, yellow"
path = /obj/item/clothing/suit/storage/toggle/hoodie/yellow
/datum/gear/suit/hoodie/green
display_name = "hoodie, green"
path = /obj/item/clothing/suit/storage/toggle/hoodie/green
/datum/gear/suit/hoodie/orange
display_name = "hoodie, orange"
path = /obj/item/clothing/suit/storage/toggle/hoodie/orange
/datum/gear/suit/hoodie/black
display_name = "hoodie, black"
path = /obj/item/clothing/suit/storage/toggle/hoodie/black
/datum/gear/suit/hoodie/cti
display_name = "hoodie, CTI"
path = /obj/item/clothing/suit/storage/toggle/hoodie/cti
/datum/gear/suit/hoodie/mu
display_name = "hoodie, MU"
path = /obj/item/clothing/suit/storage/toggle/hoodie/mu
/datum/gear/suit/hoodie/nt
display_name = "hoodie, NT"
path = /obj/item/clothing/suit/storage/toggle/hoodie/nt
/datum/gear/suit/hoodie/smw
display_name = "hoodie, Space Mountain Wind"
path = /obj/item/clothing/suit/storage/toggle/hoodie/smw
/datum/gear/suit/hoodie/New()
..()
var/list/hoodies = list()
for(var/hoodie_style in typesof(/obj/item/clothing/suit/storage/toggle/hoodie))
var/obj/item/clothing/suit/storage/toggle/hoodie/hoodie = hoodie_style
hoodies[initial(hoodie.name)] = hoodie
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hoodies))
/datum/gear/suit/labcoat
display_name = "labcoat"
@@ -145,29 +113,18 @@
cost = 1
/datum/gear/suit/poncho
display_name = "poncho, tan"
display_name = "poncho"
path = /obj/item/clothing/suit/poncho
cost = 1
/datum/gear/suit/poncho/blue
display_name = "poncho, blue"
path = /obj/item/clothing/suit/poncho/blue
/datum/gear/suit/poncho/New()
..()
var/list/ponchos = list()
for(var/poncho_style in typesof(/obj/item/clothing/suit/poncho))
var/obj/item/clothing/suit/storage/toggle/hoodie/poncho = poncho_style
ponchos[initial(poncho.name)] = poncho
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(ponchos))
/datum/gear/suit/poncho/green
display_name = "poncho, green"
path = /obj/item/clothing/suit/poncho/green
/datum/gear/suit/poncho/purple
display_name = "poncho, purple"
path = /obj/item/clothing/suit/poncho/purple
/datum/gear/suit/poncho/red
display_name = "poncho, red"
path = /obj/item/clothing/suit/poncho/red
/datum/gear/suit/poncho/security
display_name = "poncho, security"
path = /obj/item/clothing/suit/poncho/security
/datum/gear/suit/unathi_robe
display_name = "roughspun robe"

210
code/modules/client/preference_setup/loadout/loadout_uniform.dm
View File

@@ -33,93 +33,17 @@
display_name = "cut top, red"
path = /obj/item/clothing/under/cuttop/red
/datum/gear/uniform/jumpskirt
display_name = "jumpskirt, black"
path = /obj/item/clothing/under/blackjumpskirt
/datum/gear/uniform/jumpsuit
display_name = "jumpsuit, rainbow"
path = /obj/item/clothing/under/rainbow
/datum/gear/uniform/jumpsuit/black
display_name = "jumpsuit, black"
path = /obj/item/clothing/under/color/black
/datum/gear/uniform/jumpsuit/blackfemale
display_name = "jumpsuit, female-black"
path = /obj/item/clothing/under/color/blackf
/datum/gear/uniform/jumpsuit/blue
display_name = "jumpsuit, blue"
path = /obj/item/clothing/under/color/blue
/datum/gear/uniform/jumpsuit/green
display_name = "jumpsuit, green"
path = /obj/item/clothing/under/color/green
/datum/gear/uniform/jumpsuit/grey
display_name = "jumpsuit, grey"
display_name = "generic jumpclothes"
path = /obj/item/clothing/under/color/grey
/datum/gear/uniform/jumpsuit/pink
display_name = "jumpsuit, pink"
path = /obj/item/clothing/under/color/pink
/datum/gear/uniform/jumpsuit/white
display_name = "jumpsuit, white"
path = /obj/item/clothing/under/color/white
/datum/gear/uniform/jumpsuit/yellow
display_name = "jumpsuit, yellow"
path = /obj/item/clothing/under/color/yellow
/datum/gear/uniform/jumpsuit/lightblue
display_name = "jumpsuit, lightblue"
path = /obj/item/clothing/under/lightblue
/datum/gear/uniform/jumpsuit/red
display_name = "jumpsuit, red"
path = /obj/item/clothing/under/color/red
/datum/gear/uniform/jumpsuit/aqua
display_name = "jumpsuit, aqua"
path = /obj/item/clothing/under/aqua
/datum/gear/uniform/jumpsuit/purple
display_name = "jumpsuit, purple"
path = /obj/item/clothing/under/purple
/datum/gear/uniform/jumpsuit/lightpurple
display_name = "jumpsuit, lightpurple"
path = /obj/item/clothing/under/lightpurple
/datum/gear/uniform/jumpsuit/lightgreen
display_name = "jumpsuit, lightgreen"
path = /obj/item/clothing/under/lightgreen
/datum/gear/uniform/jumpsuit/lightbrown
display_name = "jumpsuit, lightbrown"
path = /obj/item/clothing/under/lightbrown
/datum/gear/uniform/jumpsuit/brown
display_name = "jumpsuit, brown"
path = /obj/item/clothing/under/brown
/datum/gear/uniform/jumpsuit/yellowgreen
display_name = "jumpsuit, yellowgreen"
path = /obj/item/clothing/under/yellowgreen
/datum/gear/uniform/jumpsuit/darkblue
display_name = "jumpsuit, darkblue"
path = /obj/item/clothing/under/darkblue
/datum/gear/uniform/jumpsuit/lightred
display_name = "jumpsuit, lightred"
path = /obj/item/clothing/under/lightred
/datum/gear/uniform/jumpsuit/darkred
display_name = "jumpsuit, darkred"
path = /obj/item/clothing/under/darkred
/datum/gear/uniform/jumpsuit/New()
..()
var/list/jumpclothes = list()
for(var/jump in typesof(/obj/item/clothing/under/color))
var/obj/item/clothing/under/color/jumps = jump
jumpclothes[initial(jumps.name)] = jumps
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jumpclothes))
/datum/gear/uniform/skirt
display_name = "plaid skirt, blue"
@@ -228,112 +152,28 @@
allowed_roles = list("Quartermaster","Cargo Technician")
/datum/gear/uniform/pants
display_name = "pants, white"
display_name = "pants"
path = /obj/item/clothing/under/pants/white
/datum/gear/uniform/pants/red
display_name = "pants, red"
path = /obj/item/clothing/under/pants/red
/datum/gear/uniform/pants/New()
..()
var/list/pants = list()
for(var/pant in typesof(/obj/item/clothing/under/pants))
var/obj/item/clothing/under/pants/pant_type = pant
pants[initial(pant_type.name)] = pant_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pants))
/datum/gear/uniform/pants/black
display_name = "pants, black"
path = /obj/item/clothing/under/pants/black
/datum/gear/uniform/pants/tan
display_name = "pants, tan"
path = /obj/item/clothing/under/pants/tan
/datum/gear/uniform/pants/track
display_name = "pants, track"
path = /obj/item/clothing/under/pants/track
/datum/gear/uniform/pants/khaki
display_name = "pants, khaki"
path = /obj/item/clothing/under/pants/khaki
/datum/gear/uniform/pants/camo
display_name = "pants, camo"
path = /obj/item/clothing/under/pants/camo
/datum/gear/uniform/pants/jeans
display_name = "pants, jeans"
path = /obj/item/clothing/under/pants/jeans
/datum/gear/uniform/pants/jeans/classic
display_name = "pants, classic jeans"
path = /obj/item/clothing/under/pants/classicjeans
/datum/gear/uniform/pants/jeans/mustang
display_name = "pants, mustang jeans"
path = /obj/item/clothing/under/pants/mustangjeans
/datum/gear/uniform/pants/jeans/black
display_name = "pants, black jeans"
path = /obj/item/clothing/under/pants/blackjeans
/datum/gear/uniform/pants/jeans/grey
display_name = "pants, grey jeans"
path = /obj/item/clothing/under/pants/greyjeans
/datum/gear/uniform/pants/jeans/youngfolks
display_name = "pants, young folks jeans"
path = /obj/item/clothing/under/pants/youngfolksjeans
/datum/gear/uniform/jeans
display_name = "shorts, jeans"
/datum/gear/uniform/shorts
display_name = "shorts"
path = /obj/item/clothing/under/shorts/jeans
/datum/gear/uniform/jeans/classic
display_name = "shorts, classic jeans"
path = /obj/item/clothing/under/shorts/jeans/classic
/datum/gear/uniform/jeans/mustang
display_name = "shorts, mustang jeans"
path = /obj/item/clothing/under/shorts/jeans/mustang
/datum/gear/uniform/jeans/youngfolks
display_name = "shorts, young folks jeans"
path = /obj/item/clothing/under/shorts/jeans/youngfolks
/datum/gear/uniform/jeans/black
display_name = "shorts, black jeans"
path = /obj/item/clothing/under/shorts/jeans/black
/datum/gear/uniform/jeans/grey
display_name = "shorts, grey jeans"
path = /obj/item/clothing/under/shorts/jeans/grey
/datum/gear/uniform/jeans/female
display_name = "shorts, female, jeans"
path = /obj/item/clothing/under/shorts/jeans/female
/datum/gear/uniform/jeans/classic/female
display_name = "shorts, female, classic jeans"
path = /obj/item/clothing/under/shorts/jeans/classic/female
/datum/gear/uniform/jeans/mustang/female
display_name = "shorts, female, mustang jeans"
path = /obj/item/clothing/under/shorts/jeans/mustang/female
/datum/gear/uniform/jeans/youngfolks/female
display_name = "shorts, female, young folks jeans"
path = /obj/item/clothing/under/shorts/jeans/youngfolks/female
/datum/gear/uniform/jeans/black/female
display_name = "shorts, female, black jeans"
path = /obj/item/clothing/under/shorts/jeans/black/female
/datum/gear/uniform/jeans/grey/female
display_name = "shorts, female, grey jeans"
path = /obj/item/clothing/under/shorts/jeans/grey/female
/datum/gear/uniform/khaki
display_name = "shorts, khaki"
path = /obj/item/clothing/under/shorts/khaki
/datum/gear/uniform/khaki/female
display_name = "shorts, female, khaki"
path = /obj/item/clothing/under/shorts/khaki/female
/datum/gear/uniform/shorts/New()
..()
var/list/shorts = list()
for(var/short in typesof(/obj/item/clothing/under/shorts))
var/obj/item/clothing/under/pants/short_type = short
shorts[initial(short_type.name)] = short_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(shorts))
/datum/gear/uniform/suit //amish
display_name = "suit, amish"

2
code/modules/client/preference_setup/occupation/occupation.dm
View File

@@ -44,7 +44,7 @@
pref.job_engsec_high = sanitize_integer(pref.job_engsec_high, 0, 65535, initial(pref.job_engsec_high))
pref.job_engsec_med = sanitize_integer(pref.job_engsec_med, 0, 65535, initial(pref.job_engsec_med))
pref.job_engsec_low = sanitize_integer(pref.job_engsec_low, 0, 65535, initial(pref.job_engsec_low))
if(!pref.player_alt_titles) pref.player_alt_titles = new()
if(!(pref.player_alt_titles)) pref.player_alt_titles = new()
if(!job_master)
return