mirror of
https://github.com/quotefox/Hyper-Station-13.git
synced 2026-08-23 12:46:17 +01:00
Revert "Merge branch 'master' into fairylights"
This reverts commit2947727659, reversing changes made to91063fe882.
This commit is contained in:
@@ -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"])
|
||||
|
||||
Reference in New Issue
Block a user