cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-14 09:28:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into various-fixes

Browse Source
This commit is contained in:
DragonTrance
2021-04-20 00:56:44 -07:00
committed by GitHub
parent b4039d7cbb 38c83b2039
commit 20e2c2fcea
284 changed files with 10972 additions and 130623 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/client/loadout/__donator.dm
+14 -7
View File
@@ -99,16 +99,23 @@
path = /obj/item/clothing/head/crystalline
ckeywhitelist = list("dragontrance")
/datum/gear/lyricalpawsplush
name = "Winter Dawn Plushie"
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/mammal/lyricalpaws
ckeywhitelist = list("lyricalpaws")
/datum/gear/lyricalpawssuit
name = "Fleet Commander's Overcoat"
category = SLOT_IN_BACKPACK
path = /obj/item/clothing/suit/hooded/wintercoat/chloe
path = /obj/item/clothing/suit/chloe
ckeywhitelist = list("lyricalpaws")
/datum/gear/lyricalpawshat
name = "Fleet Commander's Beret"
category = SLOT_IN_BACKPACK
path = /obj/item/clothing/head/chloe
cost = 0
ckeywhitelist = list("lyricalpaws")
datum/gear/darksabresheath
name = "Dark Sabre Sheath"
category = SLOT_IN_BACKPACK
path = /obj/item/storage/belt/sabre/chloesabre
ckeywhitelist = list("lyricalpaws")
/datum/gear/cherostavikmask
modular_citadel/code/modules/client/loadout/backpack.dm
+42 -2
View File
@@ -175,12 +175,12 @@
name = "Teal Lipstick"
category = SLOT_IN_BACKPACK
path = /obj/item/lipstick/teal
/datum/gear/lipstick_fuchsia
name = "Fuchsia Lipstick"
category = SLOT_IN_BACKPACK
path = /obj/item/lipstick/fuchsia
/datum/gear/lipstick_navy
name = "Navy Blue Lipstick"
category = SLOT_IN_BACKPACK
@@ -196,6 +196,46 @@
category = SLOT_IN_BACKPACK
path = /obj/item/lipstick/white
/datum/gear/nailpolish_red
name = "Red Nail Polish"
category = SLOT_IN_BACKPACK
path = /obj/item/nailpolish/red
/datum/gear/nailpolish_blue
name = "Blue Nail Polish"
category = SLOT_IN_BACKPACK
path = /obj/item/nailpolish/blue
/datum/gear/nailpolish_aqua
name = "Cyan Nail Polish"
category = SLOT_IN_BACKPACK
path = /obj/item/nailpolish/aqua
/datum/gear/nailpolish_black
name = "Black Nail Polish"
category = SLOT_IN_BACKPACK
path = /obj/item/nailpolish/black
/datum/gear/nailpolish_white
name = "White Nail Polish"
category = SLOT_IN_BACKPACK
path = /obj/item/nailpolish/white
/datum/gear/nailpolish_navy
name = "Navy Nail Polish"
category = SLOT_IN_BACKPACK
path = /obj/item/nailpolish/navy
/datum/gear/nailpolish_yellow
name = "Yellow Nail Polish"
category = SLOT_IN_BACKPACK
path = /obj/item/nailpolish/yellow
/datum/gear/nailpolish_purple
name = "Purple Nail Polish"
category = SLOT_IN_BACKPACK
path = /obj/item/nailpolish/purple
/datum/gear/condom
name = "Condom"
category = SLOT_IN_BACKPACK
modular_citadel/code/modules/client/loadout/gloves.dm
+6 -1
View File
@@ -3,6 +3,11 @@
category = SLOT_GLOVES
path = /obj/item/clothing/gloves/fingerless
/datum/gear/gcgloves
name = "Fingerless Leather Gloves"
category = SLOT_GLOVES
path = /obj/item/clothing/gloves/guncaster
/datum/gear/goldring
name = "A gold ring"
category = SLOT_GLOVES
@@ -19,4 +24,4 @@
name = "A diamond ring"
category = SLOT_GLOVES
path = /obj/item/clothing/gloves/ring/diamond
cost = 4
cost = 4
modular_citadel/code/modules/client/loadout/suit.dm
+16
View File
@@ -120,6 +120,17 @@
path = /obj/item/clothing/suit/flakjack
cost = 2
/datum/gear/gcvest
name = "Guncaster's Vest"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/gcvest
/datum/gear/gcvestalt
name = "Hellraider's Vest"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/gcvest/alt
/datum/gear/trekds9_coat
name = "DS9 Overcoat (use uniform)"
category = SLOT_WEAR_SUIT
@@ -218,3 +229,8 @@
name = "Pharoah tunic"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/nemes
/datum/gear/fluffcoat
name = "Winter labcoat"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/toggle/labcoat/formallab
modular_citadel/code/modules/client/loadout/uniform.dm
+6
View File
@@ -458,6 +458,12 @@
path = /obj/item/clothing/under/polychromic/bottomless
cost = 2
/datum/gear/polysweatervirgin
name = "Polychromic Virginkiller Sweater"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/polychromic/vsweater
cost = 2
/datum/gear/corset
name = "Corset"
category = SLOT_W_UNIFORM
modular_citadel/code/modules/client/preferences.dm
+1
View File
@@ -57,6 +57,7 @@ datum/preferences/copy_to(mob/living/carbon/human/character, icon_updates = 1)
..()
character.give_genitals(TRUE)
character.flavor_text = features["flavor_text"] //Let's update their flavor_text at least initially
character.ooc_text = features["ooc_text"] //Let's update their flavor_text at least initially
character.canbearoused = arousable
character.client?.prefs.lewdchem = lewdchem
if(icon_updates)
modular_citadel/code/modules/client/preferences_savefile.dm
+2
View File
@@ -7,6 +7,7 @@
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"]))
if(!features["mcolor2"] || features["mcolor"] == "#000")
features["mcolor2"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F")
if(!features["mcolor3"] || features["mcolor"] == "#000")
@@ -84,6 +85,7 @@
WRITE_FILE(S["feature_can_get_preg"], features["can_get_preg"])
//flavor text
WRITE_FILE(S["feature_flavor_text"], features["flavor_text"])
WRITE_FILE(S["feature_ooc_text"], features["ooc_text"])
//custom job titles
WRITE_FILE(S["alt_titles_preferences"], alt_titles_preferences)
//belly