Revert "Merge branch 'master' into fairylights"

This reverts commit 2947727659, reversing
changes made to 91063fe882.
This commit is contained in:
Dahlular
2022-07-09 04:55:33 -06:00
parent eb22b66720
commit e51460cb5d
123 changed files with 2065 additions and 3633 deletions
@@ -111,9 +111,4 @@
/datum/gear/cowboyboots/black
name = "Cowboy Boots, Black"
category = SLOT_SHOES
path = /obj/item/clothing/shoes/cowboyboots/black
/datum/gear/threepwoodboots
name = "theepwood's boots"
category = SLOT_SHOES
path = /obj/item/clothing/shoes/threepwoodboots
path = /obj/item/clothing/shoes/cowboyboots/black
@@ -259,8 +259,3 @@
name = "Bathrobe"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/bathrobe
/datum/gear/uniform/threepwoodjacket
name = "threepwood's jacket"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/threepwoodjacket
@@ -541,10 +541,4 @@
name = "vault jumpsuit"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/vaultsuit
cost = 1
/datum/gear/threepwood
name = "threepwood's outfit"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/threepwood
cost = 1
@@ -2,9 +2,9 @@
//ipcs
S["feature_ipc_screen"] >> features["ipc_screen"]
S["feature_ipc_antenna"] >> features["ipc_antenna"]
features["ipc_screen"] = sanitize_inlist(features["ipc_screen"], GLOB.ipc_screens_list)
features["ipc_antenna"] = sanitize_inlist(features["ipc_antenna"], GLOB.ipc_antennas_list)
//Citadel
features["flavor_text"] = sanitize_text(features["flavor_text"], initial(features["flavor_text"]))
features["ooc_text"] = sanitize_text(features["ooc_text"], initial(features["ooc_text"]))
@@ -35,7 +35,6 @@
LAZYADD(chosen_gear, path)
gear_points -= initial(path.cost)
/datum/preferences/proc/cit_character_pref_save(savefile/S)
//ipcs
WRITE_FILE(S["feature_ipc_screen"], features["ipc_screen"])