mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-12 16:38:18 +01:00
VV's WG sprites!
Thank you VV for making these. I'll tweak them a bit later to make sure everything is finished but this is the main thing. Also this commit includes nuclear bomb message tweak because I forgot to put in a seperate commit, oops
This commit is contained in:
Sonoida
@@ -663,7 +663,7 @@ This is here to make the tiles around the station mininuke change when it's arme
|
||||
if(istype(loneop))
|
||||
loneop.weight += 1
|
||||
if(loneop.weight % 5 == 0)
|
||||
message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].")
|
||||
// message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].") // Commenting this out because it's a fucking pain for the admins - Sono
|
||||
log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].")
|
||||
else
|
||||
lastlocation = newturf
|
||||
|
||||
@@ -1227,11 +1227,11 @@ GLOBAL_LIST_EMPTY(roundstart_races)
|
||||
//LIFE//
|
||||
////////
|
||||
|
||||
/datum/species/proc/handle_digestion(mob/living/carbon/human/H)
|
||||
if(HAS_TRAIT(src, TRAIT_NOHUNGER))
|
||||
return //hunger is for BABIES
|
||||
///datum/species/proc/handle_digestion(mob/living/carbon/human/H)
|
||||
// if(HAS_TRAIT(src, TRAIT_NOHUNGER))
|
||||
// return //hunger is for BABIES
|
||||
|
||||
//The fucking TRAIT_FAT mutation is the dumbest shit ever. It makes the code so difficult to work with
|
||||
/* //The fucking TRAIT_FAT mutation is the dumbest shit ever. It makes the code so difficult to work with
|
||||
if(HAS_TRAIT(H, TRAIT_FAT))//I share your pain, past coder.
|
||||
if(H.fatness < FATNESS_LEVEL_FAT)//this is a mess, indeed.
|
||||
to_chat(H, "<span class='notice'>You feel fit again!</span>")//GS13 Added a whole bunch of new fatness traits. Truly I am a masochist
|
||||
@@ -1275,7 +1275,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
|
||||
ADD_TRAIT(H, TRAIT_IMMOBILE, OBESITY)
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
H.update_inv_wear_suit()
|
||||
else if(HAS_TRAIT(H, TRAIT_IMMOBILE))
|
||||
if(H.fatness < FATNESS_LEVEL_IMMOBILE)
|
||||
to_chat(H, "<span class='notice'>You feel less restrained by your fat!</span>")
|
||||
@@ -1306,6 +1306,276 @@ GLOBAL_LIST_EMPTY(roundstart_races)
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
*/
|
||||
/datum/species/proc/handle_digestion(mob/living/carbon/human/H)
|
||||
var/obj/item/organ/genital/anus/B = H.getorganslot("anus")
|
||||
var/obj/item/organ/genital/belly/C = H.getorganslot("belly")
|
||||
var/obj/item/organ/genital/breasts/D = H.getorganslot("breasts")
|
||||
if(HAS_TRAIT(src, TRAIT_NOHUNGER))
|
||||
return //hunger is for BABIES
|
||||
|
||||
//The fucking TRAIT_FAT mutation is the dumbest shit ever. It makes the code so difficult to work with
|
||||
if(HAS_TRAIT(H, TRAIT_FAT))//I share your pain, past coder.
|
||||
if(H.fatness < FATNESS_LEVEL_FAT)//this is a mess, indeed.
|
||||
to_chat(H, "<span class='notice'>You feel fit again!</span>")//GS13 Added a whole bunch of new fatness traits. Truly I am a masochist
|
||||
REMOVE_TRAIT(H, TRAIT_FAT, OBESITY)
|
||||
B.size = B.size - 1
|
||||
B.update()
|
||||
C.size = 0
|
||||
C.update()
|
||||
D.cached_size = D.cached_size - 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
else if(H.fatness >= FATNESS_LEVEL_FATTER)
|
||||
to_chat(H, "<span class='danger'>You feel even plumper!FATTER</span>")
|
||||
REMOVE_TRAIT(H, TRAIT_FAT, OBESITY)
|
||||
ADD_TRAIT(H, TRAIT_FATTER, OBESITY)
|
||||
B.size = B.size + 1
|
||||
B.update()
|
||||
C.size = C.size + 1
|
||||
C.update()
|
||||
D.cached_size = D.cached_size + 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
else if(HAS_TRAIT(H, TRAIT_FATTER))
|
||||
if(H.fatness < FATNESS_LEVEL_FATTER)
|
||||
to_chat(H, "<span class='notice'>You feel like you've lost weight! FATTER</span>")
|
||||
REMOVE_TRAIT(H, TRAIT_FATTER, OBESITY)
|
||||
ADD_TRAIT(H, TRAIT_FAT, OBESITY)
|
||||
B.size = B.size - 1
|
||||
B.update()
|
||||
C.size = C.size - 1
|
||||
C.update()
|
||||
D.cached_size = D.cached_size - 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
else if(H.fatness >= FATNESS_LEVEL_VERYFAT)
|
||||
to_chat(H, "<span class='danger'>You feel fatter than before VERYFAT</span>")
|
||||
REMOVE_TRAIT(H, TRAIT_FATTER, OBESITY)
|
||||
ADD_TRAIT(H, TRAIT_VERYFAT, OBESITY)
|
||||
B.size = B.size + 1
|
||||
B.update()
|
||||
C.size = C.size + 1
|
||||
C.update()
|
||||
D.cached_size = D.cached_size + 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
else if(HAS_TRAIT(H, TRAIT_VERYFAT))
|
||||
if(H.fatness < FATNESS_LEVEL_VERYFAT)
|
||||
to_chat(H, "<span class='notice'>You feel like you've lost weight! VERYFAT</span>")
|
||||
REMOVE_TRAIT(H, TRAIT_VERYFAT, OBESITY)
|
||||
ADD_TRAIT(H, TRAIT_FATTER, OBESITY)
|
||||
B.size = B.size - 1
|
||||
B.update()
|
||||
C.size = C.size - 1
|
||||
C.update()
|
||||
D.cached_size = D.cached_size - 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
else if(H.fatness >= FATNESS_LEVEL_OBESE)
|
||||
to_chat(H, "<span class='danger'>You feel fatter than beforeOBESE</span>")
|
||||
REMOVE_TRAIT(H, TRAIT_VERYFAT, OBESITY)
|
||||
ADD_TRAIT(H, TRAIT_OBESE, OBESITY)
|
||||
B.size = B.size + 1
|
||||
B.update()
|
||||
C.size = C.size + 1
|
||||
C.update()
|
||||
D.cached_size = D.cached_size + 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
else if(HAS_TRAIT(H, TRAIT_OBESE))
|
||||
if(H.fatness < FATNESS_LEVEL_OBESE)
|
||||
to_chat(H, "<span class='notice'>You feel like you've lost weight!OBESE</span>")
|
||||
REMOVE_TRAIT(H, TRAIT_OBESE, OBESITY)
|
||||
ADD_TRAIT(H, TRAIT_VERYFAT, OBESITY)
|
||||
B.size = B.size - 1
|
||||
B.update()
|
||||
C.size = C.size - 1
|
||||
C.update()
|
||||
D.cached_size = D.cached_size - 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
else if(H.fatness >= FATNESS_LEVEL_MORBIDLY_OBESE)
|
||||
to_chat(H, "<span class='danger'>You feel a lot fatter than beforeMORBIDOBESE</span>")
|
||||
REMOVE_TRAIT(H, TRAIT_OBESE, OBESITY)
|
||||
ADD_TRAIT(H, TRAIT_MORBIDLYOBESE, OBESITY)
|
||||
B.size = B.size + 1
|
||||
B.update()
|
||||
C.size = C.size + 1
|
||||
C.update()
|
||||
D.cached_size = D.cached_size + 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
else if(HAS_TRAIT(H, TRAIT_MORBIDLYOBESE))
|
||||
if(H.fatness < FATNESS_LEVEL_MORBIDLY_OBESE)
|
||||
to_chat(H, "<span class='notice'>You feel a bit less fat!MORBIDLYOBESE</span>")
|
||||
REMOVE_TRAIT(H, TRAIT_MORBIDLYOBESE, OBESITY)
|
||||
ADD_TRAIT(H, TRAIT_OBESE, OBESITY)
|
||||
B.size = B.size - 1
|
||||
B.update()
|
||||
C.size = C.size - 1
|
||||
C.update()
|
||||
D.cached_size = D.cached_size - 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
else if(H.fatness >= FATNESS_LEVEL_EXTREMELY_OBESE)
|
||||
to_chat(H, "<span class='danger'>You feel your fat belly rubbing on the floor!FATNESS_LEVEL_exob</span>")
|
||||
REMOVE_TRAIT(H, TRAIT_MORBIDLYOBESE, OBESITY)
|
||||
ADD_TRAIT(H, TRAIT_EXTREMELYOBESE, OBESITY)
|
||||
B.size = B.size + 1
|
||||
B.update()
|
||||
C.size = C.size + 1
|
||||
C.update()
|
||||
D.cached_size = D.cached_size + 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
else if(HAS_TRAIT(H, TRAIT_EXTREMELYOBESE))
|
||||
if(H.fatness < FATNESS_LEVEL_EXTREMELY_OBESE)
|
||||
to_chat(H, "<span class='notice'>You feel less restrained by your fat!(FATNESS_LEVEL_exeobese)</span>")
|
||||
REMOVE_TRAIT(H, TRAIT_EXTREMELYOBESE, OBESITY)
|
||||
ADD_TRAIT(H, TRAIT_MORBIDLYOBESE, OBESITY)
|
||||
B.size = B.size - 1
|
||||
B.update()
|
||||
C.size = C.size - 1
|
||||
C.update()
|
||||
D.cached_size = D.cached_size - 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
else if(H.fatness >= FATNESS_LEVEL_BARELYMOBILE)
|
||||
to_chat(H, "<span class='danger'>You feel like you've become a mountain of fat!(FATNESS_LEVEL_barelymobile1)</span>")
|
||||
REMOVE_TRAIT(H, TRAIT_EXTREMELYOBESE, OBESITY)
|
||||
ADD_TRAIT(H, TRAIT_BARELYMOBILE, OBESITY)
|
||||
B.size = B.size + 1
|
||||
B.update()
|
||||
C.size = C.size + 1
|
||||
C.update()
|
||||
D.cached_size = D.cached_size + 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
else if(HAS_TRAIT(H, TRAIT_BARELYMOBILE))
|
||||
if(H.fatness < FATNESS_LEVEL_BARELYMOBILE)
|
||||
to_chat(H, "<span class='notice'>You feel less restrained by your fat!(FATNESS_LEVEL_barelymbie)</span>")
|
||||
REMOVE_TRAIT(H, TRAIT_BARELYMOBILE, OBESITY)
|
||||
ADD_TRAIT(H, TRAIT_EXTREMELYOBESE, OBESITY)
|
||||
B.size = B.size - 1
|
||||
B.update()
|
||||
C.size = C.size - 1
|
||||
C.update()
|
||||
D.cached_size = D.cached_size - 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
else if(H.fatness >= FATNESS_LEVEL_IMMOBILE)
|
||||
to_chat(H, "<span class='danger'>You feel like you've become a mountain of fat!(FATNESS_LEVEL_IMMOBILE)</span>")
|
||||
REMOVE_TRAIT(H, TRAIT_BARELYMOBILE, OBESITY)
|
||||
ADD_TRAIT(H, TRAIT_IMMOBILE, OBESITY)
|
||||
B.size = B.size + 1
|
||||
B.update()
|
||||
C.size = C.size + 1
|
||||
C.update()
|
||||
D.cached_size = D.cached_size + 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
else if(HAS_TRAIT(H, TRAIT_IMMOBILE))
|
||||
if(H.fatness < FATNESS_LEVEL_IMMOBILE)
|
||||
to_chat(H, "<span class='notice'>You feel less restrained by your fat (FATNESS_LEVEL_IMMOBILE)!</span>")
|
||||
REMOVE_TRAIT(H, TRAIT_IMMOBILE, OBESITY)
|
||||
ADD_TRAIT(H, TRAIT_BARELYMOBILE, OBESITY)
|
||||
B.size = B.size - 1
|
||||
B.update()
|
||||
C.size = C.size - 1
|
||||
C.update()
|
||||
D.cached_size = D.cached_size - 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
else if(H.fatness > FATNESS_LEVEL_BLOB)
|
||||
to_chat(H, "<span class='danger'>You feel like you've become a mountain of fat!(FATNESS_LEVEL_BLOB)</span>")
|
||||
REMOVE_TRAIT(H, TRAIT_IMMOBILE, OBESITY)
|
||||
ADD_TRAIT(H, TRAIT_BLOB, OBESITY)
|
||||
B.size = B.size + 1
|
||||
B.update()
|
||||
C.size = C.size + 1
|
||||
C.update()
|
||||
D.cached_size = D.cached_size + 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
else if(HAS_TRAIT(H, TRAIT_BLOB))
|
||||
if(H.fatness < FATNESS_LEVEL_BLOB)
|
||||
to_chat(H, "<span class='notice'>You feel like you've regained some mobility!BLOB</span>")
|
||||
REMOVE_TRAIT(H, TRAIT_BLOB, OBESITY)
|
||||
ADD_TRAIT(H, TRAIT_IMMOBILE, OBESITY)
|
||||
B.size = B.size - 1
|
||||
B.update()
|
||||
C.size = C.size - 1
|
||||
C.update()
|
||||
D.cached_size = D.cached_size - 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
else
|
||||
if(H.fatness >= FATNESS_LEVEL_FAT)
|
||||
to_chat(H, "<span class='danger'>You suddenly feel blubbery! FAT</span>")
|
||||
ADD_TRAIT(H, TRAIT_FAT, OBESITY)
|
||||
B.size = B.size + 1
|
||||
B.update()
|
||||
C.size = C.size + 1
|
||||
C.update()
|
||||
D.cached_size = D.cached_size + 1
|
||||
D.update()
|
||||
H.genital_override = TRUE
|
||||
H.update_body()
|
||||
H.update_inv_w_uniform()
|
||||
H.update_inv_wear_suit()
|
||||
|
||||
|
||||
// nutrition decrease and satiety
|
||||
if (H.nutrition > 0 && H.stat != DEAD && !HAS_TRAIT(H, TRAIT_NOHUNGER))
|
||||
@@ -1370,7 +1640,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
|
||||
H.throw_alert("nutrition", /obj/screen/alert/hungry)
|
||||
if(0 to NUTRITION_LEVEL_STARVING)
|
||||
H.throw_alert("nutrition", /obj/screen/alert/starving)
|
||||
|
||||
|
||||
switch(H.fullness)
|
||||
if(0 to FULLNESS_LEVEL_BLOATED)
|
||||
H.clear_alert("fullness")
|
||||
@@ -1533,7 +1803,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
|
||||
if(SANITY_UNSTABLE to SANITY_DISTURBED)
|
||||
. += 0.5
|
||||
*/
|
||||
if(HAS_TRAIT(H, TRAIT_FAT))
|
||||
/* if(HAS_TRAIT(H, TRAIT_FAT))
|
||||
. += (1 - flight)
|
||||
if(HAS_TRAIT(H, TRAIT_OBESE))//GS13 fat levels move speed decrease
|
||||
. += (1.5 - flight)
|
||||
@@ -1546,7 +1816,28 @@ GLOBAL_LIST_EMPTY(roundstart_races)
|
||||
if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !HAS_TRAIT(H, TRAIT_RESISTCOLD))
|
||||
. += (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.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !HAS_TRAIT(H, TRAIT_RESISTCOLD))
|
||||
. += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR
|
||||
return .
|
||||
//////////////////
|
||||
// ATTACK PROCS //
|
||||
//////////////////
|
||||
|
||||
Reference in New Issue
Block a user