cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Commented out more of the fat code, for issue #71.

Browse Source
This commit is contained in:
Albert Iordache
2011-12-06 19:23:25 +02:00
parent 6a62c3b8ff
commit 9dc2644e51
12 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/humanoid/life.dm
+3 -3
View File
@@ -361,16 +361,16 @@
if(reagents) reagents.metabolize(src)
/* if(src.nutrition > 500 && !(src.mutations & FAT))
/*if(src.nutrition > 500 && !(src.mutations & FAT))
if(prob(5 + round((src.nutrition - 200) / 2)))
src << "\red You suddenly feel blubbery!"
src.mutations |= FAT
// update_body() */
update_body()
if (src.nutrition < 100 && src.mutations & FAT)
if(prob(round((50 - src.nutrition) / 100)))
src << "\blue You feel fit again!"
src.mutations &= ~FAT
// update_body()
update_body()*/
if (src.nutrition > 0)
src.nutrition -= HUNGER_FACTOR
code/modules/mob/living/carbon/alien/larva/larva.dm
+2 -2
View File
@@ -28,13 +28,13 @@
now_pushing = 1
if(ismob(AM))
var/mob/tmob = AM
if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT)
/*if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT)
if(prob(70))
for(var/mob/M in viewers(src, null))
if(M.client)
M << "\red <B>[src] fails to push [tmob]'s fat ass out of the way.</B>"
now_pushing = 0
return
return*/
tmob.LAssailant = src
now_pushing = 0
code/modules/mob/living/carbon/alien/larva/life.dm
+2 -2
View File
@@ -292,12 +292,12 @@
if(prob(5 + round((nutrition - 200) / 2)))
src << "\red You suddenly feel blubbery!"
mutations |= FAT
// update_body() */
update_body()
if (nutrition < 100 && mutations & FAT)
if(prob(round((50 - nutrition) / 100)))
src << "\blue You feel fit again!"
mutations &= ~FAT
// update_body()
update_body()*/
if (nutrition > 0)
nutrition-= HUNGER_FACTOR
code/modules/mob/living/carbon/carbon.dm
+3 -3
View File
@@ -5,8 +5,8 @@
src.nutrition -= HUNGER_FACTOR/10
if(src.m_intent == "run")
src.nutrition -= HUNGER_FACTOR/10
if(src.mutations & FAT && src.m_intent == "run" && src.bodytemperature <= 360)
src.bodytemperature += 2
/*if(src.mutations & FAT && src.m_intent == "run" && src.bodytemperature <= 360)
src.bodytemperature += 2*/
/mob/living/carbon/relaymove(var/mob/user, direction)
if(user in src.stomach_contents)
@@ -194,4 +194,4 @@
src.admin_observing = 0
if(src.sleeping_willingly)
src.sleeping = 0
src.sleeping_willingly = 0
src.sleeping_willingly = 0
code/modules/mob/living/carbon/human/human.dm
+23 -23
View File
@@ -125,12 +125,12 @@
Metroid.UpdateFeed()
return
if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT)
/*if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT)
if(prob(40) && !(mutations & FAT))
visible_message("\red <B>[src] fails to push [tmob]'s fat ass out of the way.</B>", \
"\red <B>You fail to push [tmob]'s fat ass out of the way.</B>")
now_pushing = 0
return
return*/
tmob.LAssailant = src
@@ -175,8 +175,8 @@
if(shoes)
tally += shoes.slowdown
if(mutations & FAT)
tally += 1.5
/*if(mutations & FAT)
tally += 1.5*/
if (bodytemperature < 283.222)
tally += (283.222 - bodytemperature) / 10 * 1.75
@@ -458,9 +458,9 @@
return
if (!( istype(W, /obj/item/clothing/suit) ))
return
if (mutations & FAT && !(W.flags & ONESIZEFITSALL))
/*if (mutations & FAT && !(W.flags & ONESIZEFITSALL))
src << "\red You're too fat to wear the [W.name]!"
return
return*/
u_equip(W)
wear_suit = W
W.equipped(src, text)
@@ -540,9 +540,9 @@
return
if (!( istype(W, /obj/item/clothing/under) ))
return
if (mutations & FAT && !(W.flags & ONESIZEFITSALL))
/*if (mutations & FAT && !(W.flags & ONESIZEFITSALL))
src << "\red You're too fat to wear the [W.name]!"
return
return*/
u_equip(W)
w_uniform = W
W.equipped(src, text)
@@ -725,8 +725,8 @@
// lol
var/fat = ""
if (mutations & FAT)
fat = "fat"
/*if (mutations & FAT)
fat = "fat"*/
if (mutations & HULK)
overlays += image("icon" = 'genetics.dmi', "icon_state" = "hulk[fat][!lying ? "_s" : "_l"]")
@@ -813,7 +813,7 @@
// Uniform
if(w_uniform)
if (mutations & FAT && !(w_uniform.flags & ONESIZEFITSALL))
/*if (mutations & FAT && !(w_uniform.flags & ONESIZEFITSALL))
src << "\red You burst out of the [w_uniform.name]!"
var/obj/item/clothing/c = w_uniform
u_equip(c)
@@ -822,17 +822,17 @@
if(c)
c:loc = loc
c:dropped(src)
c:layer = initial(c:layer)
c:layer = initial(c:layer)*/
if(w_uniform)//I should really not need these
w_uniform.screen_loc = ui_iclothing
if(istype(w_uniform, /obj/item/clothing/under))
var/t1 = w_uniform.color
if (!t1)
t1 = icon_state
if (mutations & FAT)
/*if (mutations & FAT)
overlays += image("icon" = 'uniform_fat.dmi', "icon_state" = "[t1][!lying ? "_s" : "_l"]", "layer" = MOB_LAYER)
else
overlays += image("icon" = 'uniform.dmi', "icon_state" = text("[][]",t1, (!(lying) ? "_s" : "_l")), "layer" = MOB_LAYER)
else*/
overlays += image("icon" = 'uniform.dmi', "icon_state" = text("[][]",t1, (!(lying) ? "_s" : "_l")), "layer" = MOB_LAYER)
if (w_uniform.blood_DNA)
var/icon/stain_icon = icon('blood.dmi', "uniformblood[!lying ? "" : "2"]")
overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
@@ -912,7 +912,7 @@
if (wear_suit)
if (mutations & FAT && !(wear_suit.flags & ONESIZEFITSALL))
/*if (mutations & FAT && !(wear_suit.flags & ONESIZEFITSALL))
src << "\red You burst out of the [wear_suit.name]!"
var/obj/item/clothing/c = wear_suit
u_equip(c)
@@ -921,7 +921,7 @@
if(c)
c:loc = loc
c:dropped(src)
c:layer = initial(c:layer)
c:layer = initial(c:layer)*/
if (istype(wear_suit, /obj/item/clothing/suit))
var/t1 = wear_suit.icon_state
overlays += image("icon" = 'suit.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
@@ -1199,14 +1199,14 @@
lying_icon = new /icon('human.dmi', "blank")
var/husk = (mutations & HUSK)
var/obese = (mutations & FAT)
//var/obese = (mutations & FAT)
if (husk)
stand_icon.Blend(new /icon('human.dmi', "husk_s"), ICON_OVERLAY)
lying_icon.Blend(new /icon('human.dmi', "husk_l"), ICON_OVERLAY)
else if(obese)
/*else if(obese)
stand_icon.Blend(new /icon('human.dmi', "fatbody_s"), ICON_OVERLAY)
lying_icon.Blend(new /icon('human.dmi', "fatbody_l"), ICON_OVERLAY)
lying_icon.Blend(new /icon('human.dmi', "fatbody_l"), ICON_OVERLAY)*/
else
stand_icon.Blend(new /icon('human.dmi', "chest_[g]_s"), ICON_OVERLAY)
lying_icon.Blend(new /icon('human.dmi', "chest_[g]_l"), ICON_OVERLAY)
@@ -1227,9 +1227,9 @@
lying_icon.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT)
if (underwear > 0)
if(!obese)
stand_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
lying_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_l"), ICON_OVERLAY)
//if(!obese)
stand_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
lying_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_l"), ICON_OVERLAY)
/mob/living/carbon/human/proc/update_face()
if(!facial_hair_style || !hair_style) return//Seems people like to lose their icons, this should stop the runtimes for now
code/modules/mob/living/carbon/human/life.dm
+3 -3
View File
@@ -610,14 +610,14 @@
if(getOxyLoss())
oxyloss--
/* if(overeatduration > 500 && !(mutations & FAT))
/*if(overeatduration > 500 && !(mutations & FAT))
src << "\red You suddenly feel blubbery!"
mutations |= FAT
update_body() */
update_body()
if (overeatduration < 100 && mutations & FAT)
src << "\blue You feel fit again!"
mutations &= ~FAT
update_body()
update_body()*/
// nutrition decrease
if (nutrition > 0 && stat != 2)
code/modules/mob/living/carbon/monkey/monkey.dm
+2 -2
View File
@@ -47,13 +47,13 @@
now_pushing = 1
if(ismob(AM))
var/mob/tmob = AM
if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT)
/*if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT)
if(prob(70))
for(var/mob/M in viewers(src, null))
if(M.client)
M << "\red <B>[src] fails to push [tmob]'s fat ass out of the way.</B>"
now_pushing = 0
return
return*/
tmob.LAssailant = src
now_pushing = 0
code/modules/mob/living/silicon/robot/robot.dm
+2 -2
View File
@@ -254,7 +254,7 @@
if ((!( yes ) || now_pushing))
return
now_pushing = 1
if(ismob(AM))
/*if(ismob(AM))
var/mob/tmob = AM
if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT)
if(prob(20))
@@ -263,7 +263,7 @@
M << M << "\red <B>[src] fails to push [tmob]'s fat ass out of the way.</B>"
now_pushing = 0
//unlock_medal("That's No Moon, That's A Gourmand!", 1)
return
return*/
now_pushing = 0
..()
if (istype(AM, /obj/machinery/recharge_station))
code/modules/mob/mob_grab.dm
+3 -3
View File
@@ -129,11 +129,11 @@
return
else
if (state < 3)
if(istype(affecting, /mob/living/carbon/human))
/*if(istype(affecting, /mob/living/carbon/human))
var/mob/living/carbon/human/H = affecting
if(H.mutations & FAT)
assailant << "\blue You can't strangle [affecting] through all that fat!"
return
return*/
/*Hrm might want to add this back in
//we should be able to strangle the Captain if he is wearing a hat
@@ -199,7 +199,7 @@
s_click(hud1)
return
if(M == assailant && state >= 2)
if( ( ishuman(user) && (user.mutations & FAT) && ismonkey(affecting) ) || ( isalien(user) && iscarbon(affecting) ) )
if( ( ishuman(user) /*&& (user.mutations & FAT)*/ && ismonkey(affecting) ) || ( isalien(user) && iscarbon(affecting) ) )
var/mob/living/carbon/attacker = user
for(var/mob/N in viewers(user, null))
if(N.client)
code/modules/recycling/disposal.dm
+3 -2
View File
@@ -271,7 +271,7 @@
process()
if(stat & BROKEN) // nothing can happen if broken
return
if(length(src.contents) > 0)
if(timeleft == 0)
flush = 1
@@ -478,10 +478,11 @@
// note AM since can contain mobs or objs
for(var/atom/movable/AM in D)
AM.loc = src
if(istype(AM, /mob/living/carbon/human))
/*if(istype(AM, /mob/living/carbon/human))
var/mob/living/carbon/human/H = AM
if(H.mutations & FAT) // is a human and fat?
has_fat_guy = 1 // set flag on holder
*/
if(istype(AM, /obj/effect/bigDelivery))
var/obj/effect/bigDelivery/T = AM
src.destinationTag = T.sortTag