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

Merge branch 'KabKebab:master' into master

Browse Source
This commit is contained in:
SomeGuyEatingPie
2022-04-25 19:17:06 +01:00
committed by GitHub
parent d0fc08dd7a 2ccf2d7687
commit db4b6e40d4
53 changed files with 2246 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+3 -3
View File
@@ -2379,10 +2379,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
else
to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
if("belly_size")
var/new_bellysize = input(user, "Belly size :\n(1-3)", "Character Preference") as num|null
if("belly_size") //GS13 Edit here if we add more belly sprites
var/new_bellysize = input(user, "Belly size :\n(1-12) Odd = Rounded, Even = Fat", "Character Preference") as num|null
if(new_bellysize)
features["belly_size"] = clamp(new_bellysize, 1, 3)
features["belly_size"] = clamp(new_bellysize, 1, 12)
if("butt_size")
var/new_buttsize = input(user, "Butt size :\n(0-5)", "Character Preference") as num|null
code/modules/clothing/spacesuits/hardsuit.dm
+3
View File
@@ -874,6 +874,8 @@
/obj/item/clothing/head/helmet/space/hardsuit/lavaknight
name = "cydonian helmet"
desc = "A helmet designed with both form and function in mind, it protects the user against physical trauma and hazardous conditions while also having polychromic light strips."
icon = 'modular_citadel/icons/lavaknight/item/head.dmi'
alternate_worn_icon = 'modular_citadel/icons/lavaknight/mob/head.dmi'
icon_state = "knight_cydonia"
item_state = "knight_yellow"
item_color = null
@@ -924,6 +926,7 @@
. += energy_overlay
/obj/item/clothing/suit/space/hardsuit/lavaknight
icon = 'modular_citadel/icons/lavaknight/item/suit.dmi'
icon_state = "knight_cydonia"
name = "cydonian armor"
desc = "A suit designed with both form and function in mind, it protects the user against physical trauma and hazardous conditions while also having polychromic light strips."
code/modules/vending/cola.dm
+3
View File
@@ -42,6 +42,9 @@
/obj/machinery/vending/cola/black
icon_state = "cola_black"
name = "\improper GATO Vending Machine"
desc = "A GATO constructed vending machine, hopefully it can satisfy you."
product_slogans = "Meoow!~ New sodas are now here!!"
/obj/machinery/vending/cola/red
icon_state = "red_cola"