mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-13 17:08:53 +01:00
Merge branch 'MrSky12:master' into master
This commit is contained in:
Alphas00
@@ -69,12 +69,3 @@
|
||||
/obj/effect/decal/cleanable/juice/streak
|
||||
random_icon_states = list("streak1", "streak2", "streak3", "streak4", "streak5")
|
||||
|
||||
//extreme variant, for admin or item purposes
|
||||
/datum/symptom/berry/extreme
|
||||
name = "Extreme berrification"
|
||||
stealth = -7
|
||||
resistance = 11
|
||||
stage_speed = 10
|
||||
transmittable = 2
|
||||
level = 7
|
||||
severity = 5
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
/mob/living/carbon/can_buckle()
|
||||
if(HAS_TRAIT(src, TRAIT_NO_BUCKLE))
|
||||
return FALSE
|
||||
|
||||
return ..()
|
||||
|
||||
/datum/species/can_equip(obj/item/I, slot, disable_warning, mob/living/carbon/human/H, bypass_equip_delay_self)
|
||||
if(HAS_TRAIT(H, TRAIT_NO_BACKPACK) && slot == SLOT_BACK)
|
||||
to_chat(H, "<span class='warning'>You are too fat to wear anything on your back.</span>")
|
||||
return FALSE
|
||||
|
||||
if(!istype(I, /obj/item/clothing/under/color/grey/modular) && HAS_TRAIT(H, TRAIT_NO_JUMPSUIT) && slot == SLOT_W_UNIFORM)
|
||||
to_chat(H, "<span class='warning'>You are too fat to wear [I].</span>")
|
||||
return FALSE
|
||||
|
||||
if(HAS_TRAIT(H, TRAIT_NO_MISC) && (slot == SLOT_SHOES || slot == SLOT_GLOVES || slot == SLOT_WEAR_SUIT))
|
||||
to_chat(H, "<span class='warning'>You are too fat to wear [I].</span>")
|
||||
return FALSE
|
||||
|
||||
return ..()
|
||||
@@ -51,6 +51,13 @@
|
||||
return FALSE
|
||||
|
||||
spawned_cocoon.icon_state = pick("cocoon_large1","cocoon_large2","cocoon_large3")
|
||||
var/cocoon_size = target.size_multiplier
|
||||
var/matrix/new_matrix = new
|
||||
|
||||
new_matrix.Scale(cocoon_size)
|
||||
new_matrix.Translate(0,16 * (cocoon_size-1))
|
||||
spawned_cocoon.transform = new_matrix
|
||||
|
||||
return TRUE
|
||||
|
||||
user.visible_message("<span class='warning'>[user] attempts to remove [target]'s [target.wear_suit]!</span>", "<span class='warning'>You attempt to remove [target]'s [target.wear_suit].</span>")
|
||||
|
||||
@@ -22,8 +22,67 @@
|
||||
///stuckage
|
||||
var/stuckage = FALSE
|
||||
|
||||
// Helplessness, a set of prefs that make things extra tough at higher weights. If set to FALSE, they won't do anything.
|
||||
///What fatness level disables movement?
|
||||
var/helplessness_no_movement = FALSE
|
||||
///What fatness level makes the user clumsy?
|
||||
var/helplessness_clumsy = FALSE
|
||||
///What fatness level makes the user nearsighted
|
||||
var/helplessness_nearsighted = FALSE
|
||||
///What fatness level makes the user's face unrecognizable.
|
||||
var/helplessness_hidden_face = FALSE
|
||||
///What fatness level makes the user unable to speak?
|
||||
var/helplessness_mute = FALSE
|
||||
|
||||
///What fatness level, makes the user unable to use their arms?
|
||||
var/helplessness_immobile_arms = FALSE
|
||||
///What fatness level prevents the user from wearing jumpsuits
|
||||
var/helplessness_clothing_jumpsuit = FALSE
|
||||
///What fatness level prevents the user from wearing non-jumpsuit clothing
|
||||
var/helplessness_clothing_misc = FALSE
|
||||
///What fatness level prevents the user from wearing anything on their back
|
||||
var/helplessness_clothing_back = FALSE
|
||||
///What fatness level prevents the user from being buckled to anything?
|
||||
var/helplessness_no_buckle = FALSE
|
||||
|
||||
///Does the person wish to be involved with non-con weight gain events?
|
||||
var/noncon_weight_gain = FALSE
|
||||
|
||||
///What is the max weight that the person wishes to be? If set to FALSE, there will be no max weight
|
||||
var/max_weight = FALSE
|
||||
|
||||
/// Prompts the user to choose a weight and returns said weight.
|
||||
/datum/preferences/proc/chose_weight(input_text = "Choose a weight.", mob/user)
|
||||
var/chosen_weight = FALSE
|
||||
var/picked_weight_class = input(user,
|
||||
input_text,
|
||||
"Character Preference", "None") as null|anything in list(
|
||||
"None", "Fat", "Fatter", "Very Fat", "Obese", "Morbidly Obese", "Extremely Obese", "Barely Mobile", "Immobile", "Other")
|
||||
|
||||
switch(picked_weight_class)
|
||||
if("Fat")
|
||||
chosen_weight = FATNESS_LEVEL_FATTER
|
||||
if("Fatter")
|
||||
chosen_weight = FATNESS_LEVEL_VERYFAT
|
||||
if("Very Fat")
|
||||
chosen_weight = FATNESS_LEVEL_OBESE
|
||||
if("Obese")
|
||||
chosen_weight = FATNESS_LEVEL_MORBIDLY_OBESE
|
||||
if("Morbidly Obese")
|
||||
chosen_weight = FATNESS_LEVEL_EXTREMELY_OBESE
|
||||
if("Extremely Obese")
|
||||
chosen_weight = FATNESS_LEVEL_BARELYMOBILE
|
||||
if("Barely Mobile")
|
||||
chosen_weight = FATNESS_LEVEL_IMMOBILE
|
||||
if("Immobile")
|
||||
chosen_weight = FATNESS_LEVEL_BLOB
|
||||
|
||||
if(picked_weight_class != "Other")
|
||||
return chosen_weight
|
||||
|
||||
var/custom_fatness = input(user, "What fatness level (BFI) would you like to use?", "Character Preference") as null|num
|
||||
if(isnull(custom_fatness))
|
||||
custom_fatness = FALSE
|
||||
|
||||
return custom_fatness
|
||||
|
||||
@@ -222,7 +222,11 @@
|
||||
//GS13
|
||||
#define TRAIT_WEIGHT_LOSS_IMMUNE "weight_loss_immune"
|
||||
#define TRAIT_UNIVERSAL_GAINER "universal_gainer"
|
||||
|
||||
#define TRAIT_NO_MOVE "no_move"
|
||||
#define TRAIT_NO_JUMPSUIT "no_jumpsuit"
|
||||
#define TRAIT_NO_MISC "no_misc"
|
||||
#define TRAIT_NO_BACKPACK "no_backpack"
|
||||
#define TRAIT_NO_BUCKLE "no_buckle"
|
||||
|
||||
// common trait sources
|
||||
#define TRAIT_GENERIC "generic"
|
||||
@@ -284,3 +288,5 @@
|
||||
#define NUKEOP_TRAIT "nuke-op"
|
||||
#define MEGAFAUNA_TRAIT "megafauna"
|
||||
#define DEATHSQUAD_TRAIT "deathsquad"
|
||||
#define HELPLESSNESS_TRAIT "helplessness"
|
||||
|
||||
|
||||
@@ -71,19 +71,3 @@
|
||||
name = "Blueberry virus bottle"
|
||||
desc = "A small bottle. Contains blueberry virus in synthblood medium."
|
||||
spawned_disease = /datum/disease/advance/berry_virus
|
||||
|
||||
|
||||
//admin variant of berry virus
|
||||
|
||||
/datum/disease/advance/berry_virus_extreme
|
||||
copy_type = /datum/disease/advance
|
||||
|
||||
/datum/disease/advance/berry_virus_extreme/New(make_typecache = TRUE)
|
||||
name = "Blueberry Virus"
|
||||
symptoms = list(new/datum/symptom/berry/extreme)
|
||||
..()
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/berry_extreme
|
||||
name = "Blueberry virus bottle"
|
||||
desc = "A small bottle. Contains blueberry virus in synthblood medium."
|
||||
spawned_disease = /datum/disease/advance/berry_virus_extreme
|
||||
|
||||
@@ -1072,6 +1072,19 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
dat += "<b>Stuckage (weight results in getting stuck in doors):</b><a href='?_src_=prefs;preference=stuckage'>[stuckage == TRUE ? "Enabled" : "Disabled"]</a><BR>"
|
||||
dat += "<b>Extreme Weight Gain (Sprite Size scales with weight):</b><a href='?_src_=prefs;preference=weight_gain_extreme'>[weight_gain_extreme == TRUE ? "Enabled" : "Disabled"]</a><BR>"
|
||||
|
||||
dat += "<h2>GS13 Helplessness Preferences</h2>"
|
||||
dat += "<b>Please be careful when using these mechanics as not to use them in a way that negatively impacts those around you. If you are seriously needed for something, especially something station critical, do not use these as an excuse to ignore your duty.</b><BR><BR>"
|
||||
dat += "<b>No Movement:</b><a href='?_src_=prefs;preference=helplessness_no_movement'>[helplessness_no_movement == FALSE ? "Disabled" : helplessness_no_movement]</a><BR>"
|
||||
dat += "<b>Clumsy:</b><a href='?_src_=prefs;preference=helplessness_clumsy'>[helplessness_clumsy == FALSE ? "Disabled" : helplessness_clumsy]</a><BR>"
|
||||
dat += "<b>Nearsighted:</b><a href='?_src_=prefs;preference=helplessness_nearsighted'>[helplessness_nearsighted == FALSE ? "Disabled" : helplessness_nearsighted]</a><BR>"
|
||||
dat += "<b>Hidden Face:</b><a href='?_src_=prefs;preference=helplessness_hidden_face'>[helplessness_hidden_face == FALSE ? "Disabled" : helplessness_hidden_face]</a><BR>"
|
||||
dat += "<b>Mute:</b><a href='?_src_=prefs;preference=helplessness_mute'>[helplessness_mute == FALSE ? "Disabled" : helplessness_mute]</a><BR>"
|
||||
dat += "<b>Immobile Arms:</b><a href='?_src_=prefs;preference=helplessness_immobile_arms'>[helplessness_immobile_arms == FALSE ? "Disabled" : helplessness_immobile_arms]</a><BR>"
|
||||
dat += "<b>Clothing Jumpsuit:</b><a href='?_src_=prefs;preference=helplessness_clothing_jumpsuit'>[helplessness_clothing_jumpsuit == FALSE ? "Disabled" : helplessness_clothing_jumpsuit]</a><BR>"
|
||||
dat += "<b>Clothing, Suit, Boots, and Gloves:</b><a href='?_src_=prefs;preference=helplessness_clothing_misc'>[helplessness_clothing_misc == FALSE ? "Disabled" : helplessness_clothing_misc]</a><BR>"
|
||||
dat += "<b>Clothing Back:</b><a href='?_src_=prefs;preference=helplessness_clothing_back'>[helplessness_clothing_back == FALSE ? "Disabled" : helplessness_clothing_back]</a><BR>"
|
||||
dat += "<b>No Buckle:</b><a href='?_src_=prefs;preference=helplessness_no_buckle'>[helplessness_no_buckle == FALSE ? "Disabled" : helplessness_no_buckle]</a><BR>"
|
||||
|
||||
//Add the Hyper stuff below here
|
||||
dat += "<h2>Hyper Preferences</h2>"
|
||||
dat += "<b>NonCon - Bottom:</b><a href='?_src_=prefs;preference=noncon'>[noncon == TRUE ? "Enabled" : "Disabled"]</a><BR>"
|
||||
@@ -2654,30 +2667,28 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
if("blueberry_inflation")
|
||||
blueberry_inflation = !blueberry_inflation
|
||||
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
|
||||
max_weight = chose_weight("Choose your max fatness level, your weight will not go beyond this. None will let you gain without a limit", user)
|
||||
|
||||
if("helplessness_no_movement")
|
||||
helplessness_no_movement = chose_weight("Choose the level of fatness that you would like to be made completely able to move at. None will disable this alltogether", user)
|
||||
if("helplessness_clumsy")
|
||||
helplessness_clumsy = chose_weight("Choose the level of fatness that you would like to be made clumsy at. None will disable this alltogether", user)
|
||||
if("helplessness_nearsighted")
|
||||
helplessness_nearsighted = chose_weight("Choose the level of fatness that you would like to be made nearsighted at. None will disable this alltogether", user)
|
||||
if("helplessness_hidden_face")
|
||||
helplessness_hidden_face = chose_weight("Choose the level of fatness that you would like to have you face hidden at. None will disable this alltogether", user)
|
||||
if("helplessness_mute")
|
||||
helplessness_mute = chose_weight("Choose the level of fatness that you would like to be made unable to speak at. None will disable this alltogether", user)
|
||||
if("helplessness_immobile_arms")
|
||||
helplessness_immobile_arms = chose_weight("Choose the level of fatness that you would like to be made unable to use your arms at. None will disable this alltogether", user)
|
||||
if("helplessness_clothing_jumpsuit")
|
||||
helplessness_clothing_jumpsuit = chose_weight("Choose the level of fatness that you would like to be made unable to wear jumpsuits at. None will disable this alltogether", user)
|
||||
if("helplessness_clothing_misc")
|
||||
helplessness_clothing_misc = chose_weight("Choose the level of fatness that you would like to be made unable to wear other non-jumpsuit clothing at. None will disable this alltogether", user)
|
||||
if("helplessness_clothing_back")
|
||||
helplessness_clothing_back = chose_weight("Choose the level of fatness that you would like to be made unable to wear anything on your back at. None will disable this alltogether", user)
|
||||
if("helplessness_no_buckle")
|
||||
helplessness_no_buckle = chose_weight("Choose the level of fatness that you would like to be made unable to be buckled to anything at. None will disable this alltogether", user)
|
||||
|
||||
if("inflatable_belly")
|
||||
features["inflatable_belly"] = !features["inflatable_belly"]
|
||||
|
||||
@@ -159,6 +159,16 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
|
||||
S["wl_rate"] >> wl_rate
|
||||
S["noncon_weight_gain"] >> noncon_weight_gain
|
||||
S["max_weight"] >> max_weight
|
||||
S["helplessness_no_movement"] >> helplessness_no_movement
|
||||
S["helplessness_clumsy"] >> helplessness_clumsy
|
||||
S["helplessness_nearsighted"] >> helplessness_nearsighted
|
||||
S["helplessness_hidden_face"] >> helplessness_hidden_face
|
||||
S["helplessness_mute"] >> helplessness_mute
|
||||
S["helplessness_immobile_arms"] >> helplessness_immobile_arms
|
||||
S["helplessness_clothing_jumpsuit"] >> helplessness_clothing_jumpsuit
|
||||
S["helplessness_clothing_misc"] >> helplessness_clothing_misc
|
||||
S["helplessness_clothing_back"] >> helplessness_clothing_back
|
||||
S["helplessness_no_buckle"] >> helplessness_no_buckle
|
||||
S["stuckage"] >> stuckage
|
||||
S["blueberry_inflation"] >> blueberry_inflation
|
||||
|
||||
@@ -302,6 +312,16 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
|
||||
WRITE_FILE(S["wl_rate"], wl_rate)
|
||||
WRITE_FILE(S["noncon_weight_gain"], noncon_weight_gain)
|
||||
WRITE_FILE(S["max_weight"], max_weight)
|
||||
WRITE_FILE(S["helplessness_no_movement"], helplessness_no_movement)
|
||||
WRITE_FILE(S["helplessness_clumsy"], helplessness_clumsy)
|
||||
WRITE_FILE(S["helplessness_nearsighted"], helplessness_nearsighted)
|
||||
WRITE_FILE(S["helplessness_hidden_face"], helplessness_hidden_face)
|
||||
WRITE_FILE(S["helplessness_mute"], helplessness_mute)
|
||||
WRITE_FILE(S["helplessness_immobile_arms"], helplessness_immobile_arms)
|
||||
WRITE_FILE(S["helplessness_clothing_jumpsuit"], helplessness_clothing_jumpsuit)
|
||||
WRITE_FILE(S["helplessness_clothing_misc"], helplessness_clothing_misc)
|
||||
WRITE_FILE(S["helplessness_clothing_back"], helplessness_clothing_back)
|
||||
WRITE_FILE(S["helplessness_no_buckle"], helplessness_no_buckle)
|
||||
WRITE_FILE(S["stuckage"], stuckage)
|
||||
WRITE_FILE(S["blueberry_inflation"], blueberry_inflation)
|
||||
return 1
|
||||
|
||||
@@ -1354,7 +1354,148 @@ GLOBAL_LIST_EMPTY(roundstart_races)
|
||||
ADD_TRAIT(H, trait_gain, OBESITY)
|
||||
update_body_size(H, 1)
|
||||
|
||||
/datum/species/proc/handle_helplessness(mob/living/carbon/human/fatty)
|
||||
var/datum/preferences/preferences = fatty?.client?.prefs
|
||||
if(!istype(preferences))
|
||||
return FALSE
|
||||
|
||||
if(preferences.helplessness_no_movement)
|
||||
if(!HAS_TRAIT_FROM(fatty, TRAIT_NO_MOVE, HELPLESSNESS_TRAIT))
|
||||
if(fatty.fatness >= preferences.helplessness_no_movement)
|
||||
to_chat(fatty, "<span class='warning'>You have become too fat to move anymore.</span>")
|
||||
ADD_TRAIT(fatty, TRAIT_NO_MOVE, HELPLESSNESS_TRAIT)
|
||||
|
||||
else if(fatty.fatness < preferences.helplessness_no_movement)
|
||||
to_chat(fatty, "<span class='notice'>You have become thin enough to regain some of your mobility.</span>")
|
||||
REMOVE_TRAIT(fatty, TRAIT_NO_MOVE, HELPLESSNESS_TRAIT)
|
||||
|
||||
|
||||
if(preferences.helplessness_clumsy)
|
||||
if(!HAS_TRAIT_FROM(fatty, TRAIT_CLUMSY, HELPLESSNESS_TRAIT))
|
||||
if(fatty.fatness >= preferences.helplessness_clumsy)
|
||||
to_chat(fatty, "<span class='warning'>Your newfound weight has made it hard to manipulate objects.</span>")
|
||||
ADD_TRAIT(fatty, TRAIT_CLUMSY, HELPLESSNESS_TRAIT)
|
||||
|
||||
else if(fatty.fatness < preferences.helplessness_clumsy)
|
||||
to_chat(fatty, "<span class='notice'>You feel like you have lost enough weight to recover your dexterity.</span>")
|
||||
REMOVE_TRAIT(fatty, TRAIT_CLUMSY, HELPLESSNESS_TRAIT)
|
||||
|
||||
|
||||
if(preferences.helplessness_nearsighted)
|
||||
if(!HAS_TRAIT_FROM(fatty, TRAIT_NEARSIGHT, HELPLESSNESS_TRAIT))
|
||||
if(fatty.fatness >= preferences.helplessness_nearsighted)
|
||||
to_chat(fatty, "<span class='warning'>Your fat makes it difficult to see the world around you. </span>")
|
||||
fatty.become_nearsighted(HELPLESSNESS_TRAIT)
|
||||
|
||||
else if(fatty.fatness < preferences.helplessness_nearsighted)
|
||||
to_chat(fatty, "<span class='notice'>You are thin enough to see your enviornment again. </span>")
|
||||
fatty.cure_nearsighted(HELPLESSNESS_TRAIT)
|
||||
|
||||
|
||||
if(preferences.helplessness_hidden_face)
|
||||
if(!HAS_TRAIT_FROM(fatty, TRAIT_DISFIGURED, HELPLESSNESS_TRAIT))
|
||||
if(fatty.fatness >= preferences.helplessness_hidden_face)
|
||||
to_chat(fatty, "<span class='warning'>You have gotten fat enough that your face is now unrecognizable. </span>")
|
||||
ADD_TRAIT(fatty, TRAIT_DISFIGURED, HELPLESSNESS_TRAIT)
|
||||
|
||||
else if(fatty.fatness < preferences.helplessness_hidden_face)
|
||||
to_chat(fatty, "<span class='notice'>You have lost enough weight to allow people to now recognize your face.</span>")
|
||||
REMOVE_TRAIT(fatty, TRAIT_DISFIGURED, HELPLESSNESS_TRAIT)
|
||||
|
||||
|
||||
if(preferences.helplessness_mute)
|
||||
if(!HAS_TRAIT_FROM(fatty, TRAIT_MUTE, HELPLESSNESS_TRAIT))
|
||||
if(fatty.fatness >= preferences.helplessness_mute)
|
||||
to_chat(fatty, "<span class='warning'>Your fat makes it impossible for you to speak.</span>")
|
||||
ADD_TRAIT(fatty, TRAIT_MUTE, HELPLESSNESS_TRAIT)
|
||||
|
||||
else if(fatty.fatness < preferences.helplessness_mute)
|
||||
to_chat(fatty, "<span class='notice'>You are thin enough now to be able to speak again. </span>")
|
||||
REMOVE_TRAIT(fatty, TRAIT_MUTE, HELPLESSNESS_TRAIT)
|
||||
|
||||
|
||||
if(preferences.helplessness_immobile_arms)
|
||||
if(!HAS_TRAIT_FROM(fatty, TRAIT_PARALYSIS_L_ARM, HELPLESSNESS_TRAIT))
|
||||
if(fatty.fatness >= preferences.helplessness_immobile_arms)
|
||||
to_chat(fatty, "<span class='warning'>Your arms are now engulfed in fat, making it impossible to move your arms. </span>")
|
||||
ADD_TRAIT(fatty, TRAIT_PARALYSIS_L_ARM, HELPLESSNESS_TRAIT)
|
||||
ADD_TRAIT(fatty, TRAIT_PARALYSIS_R_ARM, HELPLESSNESS_TRAIT)
|
||||
fatty.update_disabled_bodyparts()
|
||||
|
||||
else if(fatty.fatness < preferences.helplessness_immobile_arms)
|
||||
to_chat(fatty, "<span class='notice'>You are able to move your arms again. </span>")
|
||||
REMOVE_TRAIT(fatty, TRAIT_PARALYSIS_L_ARM, HELPLESSNESS_TRAIT)
|
||||
REMOVE_TRAIT(fatty, TRAIT_PARALYSIS_R_ARM, HELPLESSNESS_TRAIT)
|
||||
fatty.update_disabled_bodyparts()
|
||||
|
||||
|
||||
if(preferences.helplessness_clothing_jumpsuit)
|
||||
if(!HAS_TRAIT_FROM(fatty, TRAIT_NO_JUMPSUIT, HELPLESSNESS_TRAIT))
|
||||
if(fatty.fatness >= preferences.helplessness_clothing_jumpsuit)
|
||||
ADD_TRAIT(fatty, TRAIT_NO_JUMPSUIT, HELPLESSNESS_TRAIT)
|
||||
|
||||
var/obj/item/clothing/under/jumpsuit = fatty.w_uniform
|
||||
if(istype(jumpsuit) && !istype(jumpsuit, /obj/item/clothing/under/color/grey/modular))
|
||||
to_chat(fatty, "<span class='warning'>[jumpsuit] can no longer contain your weight!</span>")
|
||||
fatty.dropItemToGround(jumpsuit)
|
||||
|
||||
else if(fatty.fatness < preferences.helplessness_clothing_jumpsuit)
|
||||
to_chat(fatty, "<span class='notice'>You feel thin enough to put on jumpsuits now. </span>")
|
||||
REMOVE_TRAIT(fatty, TRAIT_NO_JUMPSUIT, HELPLESSNESS_TRAIT)
|
||||
|
||||
|
||||
if(preferences.helplessness_clothing_misc)
|
||||
if(!HAS_TRAIT_FROM(fatty, TRAIT_NO_MISC, HELPLESSNESS_TRAIT))
|
||||
if(fatty.fatness >= preferences.helplessness_clothing_misc)
|
||||
ADD_TRAIT(fatty, TRAIT_NO_MISC, HELPLESSNESS_TRAIT)
|
||||
|
||||
var/obj/item/clothing/suit/worn_suit = fatty.wear_suit
|
||||
if(istype(worn_suit))
|
||||
to_chat(fatty, "<span class='warning'>[worn_suit] can no longer contain your weight!</span>")
|
||||
fatty.dropItemToGround(worn_suit)
|
||||
|
||||
var/obj/item/clothing/gloves/worn_gloves = fatty.gloves
|
||||
if(istype(worn_gloves))
|
||||
to_chat(fatty, "<span class='warning'>[worn_gloves] can no longer contain your weight!</span>")
|
||||
fatty.dropItemToGround(worn_gloves)
|
||||
|
||||
var/obj/item/clothing/shoes/worn_shoes = fatty.shoes
|
||||
if(istype(worn_shoes))
|
||||
to_chat(fatty, "<span class='warning'>[worn_shoes] can no longer contain your weight!</span>")
|
||||
fatty.dropItemToGround(worn_shoes)
|
||||
|
||||
else if(fatty.fatness < preferences.helplessness_clothing_misc)
|
||||
to_chat(fatty, "<span class='notice'>You feel thin enough to put on suits, shoes, and gloves now. </span>")
|
||||
REMOVE_TRAIT(fatty, TRAIT_NO_MISC, HELPLESSNESS_TRAIT)
|
||||
|
||||
|
||||
if(preferences.helplessness_clothing_back)
|
||||
if(!HAS_TRAIT_FROM(fatty, TRAIT_NO_BACKPACK, HELPLESSNESS_TRAIT))
|
||||
if(fatty.fatness >= preferences.helplessness_clothing_back)
|
||||
ADD_TRAIT(fatty, TRAIT_NO_BACKPACK, HELPLESSNESS_TRAIT)
|
||||
var/obj/item/back_item = fatty.back
|
||||
if(istype(back_item))
|
||||
to_chat(fatty, "<span class='warning'>Your weight makes it impossible for you to carry [back_item].</span>")
|
||||
fatty.dropItemToGround(back_item)
|
||||
|
||||
else if(fatty.fatness < preferences.helplessness_clothing_back)
|
||||
to_chat(fatty, "<span class='notice'>You feel thin enough to hold items on your back now. </span>")
|
||||
REMOVE_TRAIT(fatty, TRAIT_NO_BACKPACK, HELPLESSNESS_TRAIT)
|
||||
|
||||
|
||||
if(preferences.helplessness_no_buckle)
|
||||
if(!HAS_TRAIT_FROM(fatty, TRAIT_NO_BUCKLE, HELPLESSNESS_TRAIT))
|
||||
if(fatty.fatness >= preferences.helplessness_no_buckle)
|
||||
to_chat(fatty, "<span class='warning'>You feel like you've gotten too big to fit on anything.</span>")
|
||||
ADD_TRAIT(fatty, TRAIT_NO_BUCKLE, HELPLESSNESS_TRAIT)
|
||||
|
||||
else if(fatty.fatness < preferences.helplessness_no_buckle)
|
||||
to_chat(fatty, "<span class='notice'>You feel thin enough to sit on things again. </span>")
|
||||
REMOVE_TRAIT(fatty, TRAIT_NO_BUCKLE, HELPLESSNESS_TRAIT)
|
||||
|
||||
|
||||
/datum/species/proc/handle_fatness(mob/living/carbon/human/H)
|
||||
handle_helplessness(H)
|
||||
if(HAS_TRAIT(H, TRAIT_BLOB))
|
||||
handle_fatness_trait(
|
||||
H,
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
verb_ask = "flutters inquisitively"
|
||||
verb_exclaim = "flutters intensely"
|
||||
verb_yell = "flutters intensely"
|
||||
blood_volume = 0
|
||||
|
||||
/mob/living/simple_animal/butterfly/Initialize()
|
||||
. = ..()
|
||||
|
||||
@@ -84,6 +84,10 @@
|
||||
|
||||
if(!mob.Process_Spacemove(direct))
|
||||
return FALSE
|
||||
|
||||
//GS13 EDIT
|
||||
if(HAS_TRAIT(mob, TRAIT_NO_MOVE))
|
||||
return FALSE
|
||||
|
||||
//We are now going to move
|
||||
var/add_delay = mob.movement_delay()
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 72 KiB |
@@ -3096,6 +3096,7 @@
|
||||
#include "GainStation13\code\machinery\feeding_tube.dm"
|
||||
#include "GainStation13\code\mechanics\fatness.dm"
|
||||
#include "GainStation13\code\mechanics\fattening_trap.dm"
|
||||
#include "GainStation13\code\mechanics\helplessness.dm"
|
||||
#include "GainStation13\code\mechanics\infestation.dm"
|
||||
#include "GainStation13\code\mechanics\metal_cruncher.dm"
|
||||
#include "GainStation13\code\mechanics\spells.dm"
|
||||
|
||||
Reference in New Issue
Block a user