Merge branch 'master' into final_shuttle_touches_and_stuff

This commit is contained in:
alberyk
2022-01-14 21:04:38 -03:00
99 changed files with 915 additions and 579 deletions
@@ -14,6 +14,13 @@
path = /obj/item/clothing/accessory/wcoat_rec
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/waistcoat/New()
..()
var/list/waistcoats = list()
waistcoats["waistcoat"] = /obj/item/clothing/accessory/wcoat_rec
waistcoats["waistcoat, alt"] = /obj/item/clothing/accessory/silversun/wcoat
gear_tweaks += new /datum/gear_tweak/path(waistcoats)
/datum/gear/accessory/chaps
display_name = "chaps selection"
path = /obj/item/clothing/accessory/chaps
@@ -101,10 +101,6 @@
path = /obj/item/material/stool/chair/wheelchair
cost = 4
/datum/gear/utility/wheelchair/color/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/utility/business_card_holder
display_name = "business card holder"
description = "Comes in different materials."