mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-15 01:46:41 +01:00
Merge branch 'master' into testbranch
This commit is contained in:
eyespy
@@ -167,6 +167,11 @@
|
||||
#define FATNESS_LEVEL_FATTER 250
|
||||
#define FATNESS_LEVEL_FAT 170
|
||||
|
||||
//Math stuff for fatness movement speed
|
||||
#define FATNESS_DIVISOR 860
|
||||
#define FATNESS_MAX_MOVE_PENALTY 4
|
||||
#define FATNESS_WEAKLEGS_MODIFIER 20
|
||||
|
||||
//Nutrition levels for humans
|
||||
#define NUTRITION_LEVEL_FULL 550
|
||||
#define NUTRITION_LEVEL_WELL_FED 450
|
||||
|
||||
@@ -66,8 +66,8 @@ Bonus
|
||||
symptom_delay_min = 15
|
||||
symptom_delay_max = 45
|
||||
threshold_desc = list(
|
||||
"Transmission 7" = "Increases the rate of cell replication.",
|
||||
"Transmission 12" = "Increases the rate of cell replication further"
|
||||
"Stage Speed 7" = "Increases the rate of cell replication.",
|
||||
"Stage Speed 12" = "Increases the rate of cell replication further"
|
||||
)
|
||||
|
||||
|
||||
@@ -83,9 +83,9 @@ Bonus
|
||||
to_chat(M, "<span class='warning'>[pick("You feel oddly full...", "You feel more plush...", "You feel more huggable...", "You hear an odd gurgle from your stomach")]</span>")
|
||||
else
|
||||
to_chat(M, "<span class='warning'><i>[pick("You feel your body churn...", "You feel heavier...", "You hear an ominous gurgle from your belly...", "You feel bulkier...")]</i></span>")
|
||||
if(A.properties["transmittable"] >= 12) //get chunkier quicker
|
||||
if(A.properties["stage_rate"] >= 12) //get chunkier quicker
|
||||
M.adjust_fatness(70, FATTENING_TYPE_VIRUS)
|
||||
else if(A.properties["transmittable"] >= 7)
|
||||
else if(A.properties["stage_rate"] >= 7)
|
||||
M.adjust_fatness(40, FATTENING_TYPE_VIRUS)
|
||||
else
|
||||
M.adjust_fatness(15, FATTENING_TYPE_VIRUS)
|
||||
|
||||
@@ -330,3 +330,11 @@
|
||||
suffix = "fastfood.dmm"
|
||||
name = "Fast Food Restaurant"
|
||||
description = "In GATO controlled space, it isn't uncommon to find various space restaurants, famous for the abundance of corn oil in their foods."
|
||||
|
||||
/datum/map_template/ruin/space/quantum_hub //GS13
|
||||
id = "quantum_hub"
|
||||
suffix = "quantum_hub.dmm"
|
||||
name = "Quantum Hub"
|
||||
description = "A small hub containing a quantum pad connected to xenoarch along with three other rooms containing unlinked quantum pads and the parts needed to make new quantum pads."
|
||||
cost = 0
|
||||
always_place = TRUE
|
||||
|
||||
@@ -1020,6 +1020,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
dat += "<b>Damage Screen Shake:</b> <a href='?_src_=prefs;preference=damagescreenshake'>[(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]</a><br>"
|
||||
//GS13 stuff goes here
|
||||
dat += "<h2>GS13 Preferences</h2>"
|
||||
|
||||
dat += "<b>Maximum Weight:</b><a href='?_src_=prefs;preference=max_fatness'>[max_weight == FALSE ? "None" : max_weight]</a><BR>"
|
||||
dat += "<b>NonCon - Weight Gain:</b><a href='?_src_=prefs;preference=noncon_weight_gain'>[noncon_weight_gain == TRUE ? "Enabled" : "Disabled"]</a><BR>"
|
||||
|
||||
dat += "<h2>GS13 Weight Gain</h2>"
|
||||
@@ -2559,6 +2561,30 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
|
||||
if("noncon_weight_gain")
|
||||
noncon_weight_gain = !noncon_weight_gain
|
||||
if("max_fatness")
|
||||
var/pickedweight = input(user, "Choose your max fatness level, your weight will not go beyond this. None will let you gain without a limit", "Character Preference", "None") as null|anything in list("None", "Fat", "Fatter", "Very Fat", "Obese", "Morbidly Obese", "Extremely Obese", "Barely Mobile", "Immobile")
|
||||
if(pickedweight)
|
||||
switch(pickedweight)
|
||||
if("None")
|
||||
max_weight = FALSE
|
||||
if("Fat")
|
||||
max_weight = FATNESS_LEVEL_FATTER
|
||||
if("Fatter")
|
||||
max_weight = FATNESS_LEVEL_VERYFAT
|
||||
if("Very Fat")
|
||||
max_weight = FATNESS_LEVEL_OBESE
|
||||
if("Obese")
|
||||
max_weight = FATNESS_LEVEL_MORBIDLY_OBESE
|
||||
if("Morbidly Obese")
|
||||
max_weight = FATNESS_LEVEL_EXTREMELY_OBESE
|
||||
if("Extremely Obese")
|
||||
max_weight = FATNESS_LEVEL_BARELYMOBILE
|
||||
if("Barely Mobile")
|
||||
max_weight = FATNESS_LEVEL_IMMOBILE
|
||||
if("Immobile")
|
||||
max_weight = FATNESS_LEVEL_BLOB
|
||||
|
||||
|
||||
|
||||
if("inflatable_belly")
|
||||
features["inflatable_belly"] = !features["inflatable_belly"]
|
||||
|
||||
@@ -154,6 +154,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
|
||||
S["weight_gain_viruses"] >> weight_gain_viruses
|
||||
S["weight_gain_weapons"] >> weight_gain_weapons
|
||||
S["noncon_weight_gain"] >> noncon_weight_gain
|
||||
S["max_weight"] >> max_weight
|
||||
|
||||
|
||||
//try to fix any outdated data if necessfary
|
||||
if(needs_update >= 0)
|
||||
@@ -285,6 +287,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
|
||||
WRITE_FILE(S["weight_gain_chems"], weight_gain_chems)
|
||||
WRITE_FILE(S["weight_gain_weapons"], weight_gain_weapons)
|
||||
WRITE_FILE(S["noncon_weight_gain"], noncon_weight_gain)
|
||||
WRITE_FILE(S["max_weight"], max_weight)
|
||||
|
||||
return 1
|
||||
|
||||
|
||||
@@ -1818,26 +1818,20 @@ GLOBAL_LIST_EMPTY(roundstart_races)
|
||||
. += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR
|
||||
return .
|
||||
*/
|
||||
if(HAS_TRAIT(H, TRAIT_FAT))
|
||||
. += (1 - flight)
|
||||
if(HAS_TRAIT(H, TRAIT_FATTER))
|
||||
. += (1.1 - flight)
|
||||
if(HAS_TRAIT(H, TRAIT_VERYFAT))
|
||||
. += (1.25 - flight)
|
||||
if(HAS_TRAIT(H, TRAIT_OBESE))//GS13 fat levels move speed decrease
|
||||
. += (1.5 - flight)
|
||||
if(HAS_TRAIT(H, TRAIT_MORBIDLYOBESE))
|
||||
. += (2 - flight)
|
||||
if(HAS_TRAIT(H, TRAIT_EXTREMELYOBESE))
|
||||
. += (2.5 - flight)
|
||||
if(HAS_TRAIT(H, TRAIT_BARELYMOBILE))
|
||||
. += 2.7
|
||||
if(HAS_TRAIT(H, TRAIT_IMMOBILE))
|
||||
. += 3 // No wings are going to lift that much off the ground
|
||||
if(HAS_TRAIT(H, TRAIT_BLOB))
|
||||
. += 4
|
||||
if(H.fatness)
|
||||
var/fatness_delay = (H.fatness / FATNESS_DIVISOR)
|
||||
if(H.fatness < FATNESS_LEVEL_BARELYMOBILE)
|
||||
fatness_delay = fatness_delay - flight
|
||||
|
||||
fatness_delay = min(fatness_delay, FATNESS_MAX_MOVE_PENALTY)
|
||||
if(HAS_TRAIT(H, TRAIT_WEAKLEGS) && (H.fatness > FATNESS_LEVEL_BLOB))
|
||||
fatness_delay += ((H.fatness - FATNESS_LEVEL_BLOB) * FATNESS_WEAKLEGS_MODIFIER) / FATNESS_DIVISOR
|
||||
|
||||
. += fatness_delay
|
||||
|
||||
if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !HAS_TRAIT(H, TRAIT_RESISTCOLD))
|
||||
. += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR
|
||||
|
||||
return .
|
||||
//////////////////
|
||||
// ATTACK PROCS //
|
||||
|
||||
@@ -85,8 +85,6 @@
|
||||
if(!mob.Process_Spacemove(direct))
|
||||
return FALSE
|
||||
|
||||
if(HAS_TRAIT(mob,TRAIT_BLOB) && HAS_TRAIT(mob,TRAIT_WEAKLEGS)) // GS13 are we too fat to move?
|
||||
return FALSE
|
||||
//We are now going to move
|
||||
var/add_delay = mob.movement_delay()
|
||||
mob.set_glide_size(DELAY_TO_GLIDE_SIZE(add_delay * (((direct & 3) && (direct & 12)) ? 2 : 1))) // set it now in case of pulled objects
|
||||
|
||||
Reference in New Issue
Block a user