IT WORKS! its testmergable, just gotta add in a ckey whitelist system and add casual friday, then its good

This commit is contained in:
deathride58
2018-01-15 01:02:35 -05:00
parent 036dc82e12
commit b55a497ffc
18 changed files with 274 additions and 142 deletions
@@ -7,7 +7,7 @@
name = "Cigarette pack"
category = slot_hands
path = /obj/item/storage/fancy/cigarettes
/datum/gear/dice
name = "Dice bag"
category = slot_hands
@@ -27,7 +27,12 @@
name = "Matchbox"
category = slot_hands
path = /obj/item/storage/box/matches
/datum/gear/cheaplighter
name = "Cheap lighter"
category = slot_hands
path = /obj/item/lighter/greyscale
/datum/gear/cards
name = "Playing cards"
category = slot_hands
@@ -38,11 +43,6 @@
category = slot_hands
path = /obj/item/skub
/datum/gear/slapper
name = "Slapper"
category = slot_hands
path = /obj/item/slapper
/datum/gear/carpplushie
name = "Space carp plushie"
category = slot_hands
@@ -22,6 +22,7 @@ GLOBAL_LIST_EMPTY(loadout_items)
var/path //item-to-spawn path
var/cost = 1 //normally, each loadout costs a single point.
var/list/restricted_roles
var/list/ckeywhitelist
/datum/gear/New()
..()
@@ -1 +1,4 @@
/datum/gear/balaclava
name = "Balaclava"
category = slot_wear_mask
path = /obj/item/clothing/mask/balaclava
@@ -13,6 +13,11 @@
category = slot_neck
path = /obj/item/clothing/neck/tie/black
/datum/gear/collar
name = "Collar"
category = slot_neck
path = /obj/item/clothing/neck/petcollar
/datum/gear/stethoscope
name = "Stethoscope"
category = slot_neck
@@ -2,3 +2,38 @@
name = "Laceup shoes"
category = slot_shoes
path = /obj/item/clothing/shoes/laceup
/datum/gear/workboots
name = "Work boots"
category = slot_shoes
path = /obj/item/clothing/shoes/workboots
/datum/gear/jackboots
name = "Jackboots"
category = slot_shoes
path = /obj/item/clothing/shoes/jackboots
/datum/gear/winterboots
name = "Winter boots"
category = slot_shoes
path = /obj/item/clothing/shoes/winterboots
/datum/gear/sandals
name = "Sandals"
category = slot_shoes
path = /obj/item/clothing/shoes/sandal
/datum/gear/blackshoes
name = "Black shoes"
category = slot_shoes
path = /obj/item/clothing/shoes/sneakers/black
/datum/gear/brownshoes
name = "Brown shoes"
category = slot_shoes
path = /obj/item/clothing/shoes/sneakers/brown
/datum/gear/whiteshoes
name = "White shoes"
category = slot_shoes
path = /obj/item/clothing/shoes/sneakers/white
@@ -0,0 +1,49 @@
/datum/gear/suit
name = "Black suit"
category = slot_w_uniform
path = /obj/item/clothing/under/suit_jacket
/datum/gear/greensuit
name = "Green suit"
category = slot_w_uniform
path = /obj/item/clothing/under/suit_jacket/green
/datum/gear/redsuit
name = "Red suit"
category = slot_w_uniform
path = /obj/item/clothing/under/suit_jacket/red
/datum/gear/charcoalsuit
name = "Charcoal suit"
category = slot_w_uniform
path = /obj/item/clothing/under/suit_jacket/charcoal
/datum/gear/navysuit
name = "Navy suit"
category = slot_w_uniform
path = /obj/item/clothing/under/suit_jacket/navy
/datum/gear/burgundysuit
name = "Burgundy suit"
category = slot_w_uniform
path = /obj/item/clothing/under/suit_jacket/burgundy
/datum/gear/tansuit
name = "Tan suit"
category = slot_w_uniform
path = /obj/item/clothing/under/suit_jacket/tan
/datum/gear/whitesuit
name = "White suit"
category = slot_w_uniform
path = /obj/item/clothing/under/suit_jacket/white
/datum/gear/assistantformal
name = "Assistant's formal uniform"
category = slot_w_uniform
path = /obj/item/clothing/under/assistantformal
/datum/gear/maidcostume
name = "Maid costume"
category = slot_w_uniform
path = /obj/item/clothing/under/maid