Skip to content

Commit

Permalink
Removes "fat" status and everything related. (#2516)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

As the title says, eating too much no longer makes you "fat". You suffer
no slowdown or mood debuff from eating too much, and in general, the
game will not take every opportunity to make fun of you.

Notable removals/changes:
- The "fat sucker" machine is totally gone.
- Shady Slim's cigarettes have been removed (since they only existed to
interact with this mechanic).
- Lipoplasty surgery is gone.
- The nutrition setting of scanner gates is gone.

There are a couple of other removals too, like Gluttony's Wall, that I
think were already not in use on this codebase.

One thing I'm not completely satisfied with was the change to mint
toxin, which now does quite literally nothing. I don't think this is
especially a problem, it just makes its existence a bit vestigial.

Also includes an UpdatePaths script to delete all removed objects, just
in case.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game


![image](https://github.com/shiptest-ss13/Shiptest/assets/105025397/a1dd0981-94fc-4766-a34d-cce31a42b412)

Basically, removes some shitty "jokes" about fat people. It's an
extremely mean-spirited feature that serves no actual purpose, and
punishes you for clicking on a burger one time too many. It could
potentially be replaced later with a less mean-spirited "overeating"
mechanic, but I'm dubious as to whether that would be any fun either.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: Removed the "fat" status - overeating now has no negative effects.
del: Removed lipoplasty surgery.
del: Removed the fat sucker machine.
tweak: Scanner gates no longer have a "nutrition" option available.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
lizardqueenlexi authored Nov 22, 2023
1 parent 8a3c967 commit 4d4aa72
Show file tree
Hide file tree
Showing 31 changed files with 38 additions and 526 deletions.
60 changes: 27 additions & 33 deletions _maps/deprecated/Ruins/TheDerelict.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1148,9 +1148,6 @@
"fw" = (
/turf/open/floor/plasteel/airless,
/area/ruin/space/derelict/bridge/access)
"fx" = (
/turf/open/floor/plasteel/airless,
/area/ruin/space/derelict/bridge/access)
"fy" = (
/obj/structure/table,
/obj/item/assembly/flash/handheld,
Expand Down Expand Up @@ -1837,9 +1834,6 @@
/obj/item/storage/box/lights/mixed,
/turf/open/floor/plating/airless,
/area/ruin/space/derelict/singularity_engine)
"in" = (
/turf/open/floor/plating/airless,
/area/ruin/space/derelict/singularity_engine)
"io" = (
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/airless,
Expand Down Expand Up @@ -8596,7 +8590,7 @@ dO
dP
dX
dW
in
dW
dr
iP
ay
Expand Down Expand Up @@ -10391,7 +10385,7 @@ aa
cs
fv
fF
fx
fw
cs
ga
yb
Expand Down Expand Up @@ -10503,8 +10497,8 @@ aa
dk
cs
fw
fx
fx
fw
fw
fR
eR
gm
Expand Down Expand Up @@ -10615,9 +10609,9 @@ aa
aa
aa
cs
fx
fx
fx
fw
fw
fw
cs
eR
gn
Expand Down Expand Up @@ -10729,8 +10723,8 @@ aa
aa
cs
fy
fx
fx
fw
fw
fS
MI
go
Expand Down Expand Up @@ -10842,8 +10836,8 @@ aa
ZB
cs
fz
fx
fx
fw
fw
fS
MI
go
Expand Down Expand Up @@ -10955,8 +10949,8 @@ ZB
ZB
cs
fA
fx
fx
fw
fw
fS
MI
go
Expand Down Expand Up @@ -11068,8 +11062,8 @@ ZB
ZB
cs
fB
fx
fx
fw
fw
fS
MI
gp
Expand Down Expand Up @@ -11296,10 +11290,10 @@ cs
cs
cs
cs
fx
fw
py
gq
fx
fw
fZ
gO
fZ
Expand Down Expand Up @@ -11409,10 +11403,10 @@ cx
cx
cx
cs
fx
fw
py
fx
fx
fw
fw
fZ
gL
aa
Expand Down Expand Up @@ -11635,10 +11629,10 @@ cs
cs
cs
cs
fx
fx
fx
fx
fw
fw
fw
fw
cs
cs
ZB
Expand Down Expand Up @@ -11748,10 +11742,10 @@ cs
fC
fC
cs
fx
fw
gg
fx
fx
fw
fw
cs
aa
ay
Expand Down
4 changes: 0 additions & 4 deletions _maps/deprecated/Ships/nanotrasen_pubby.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -446,10 +446,6 @@
pixel_x = 5;
pixel_y = 4
},
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims{
pixel_x = -7;
pixel_y = 6
},
/obj/item/lighter{
pixel_x = -5;
pixel_y = 4
Expand Down
3 changes: 0 additions & 3 deletions _maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7697,9 +7697,6 @@
pixel_x = 8;
pixel_y = 2
},
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims{
pixel_y = 10
},
/obj/item/lighter/greyscale{
pixel_y = 4;
pixel_x = -9
Expand Down
1 change: 0 additions & 1 deletion code/__DEFINES/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@
#define SANITY_INSANE 0

//Nutrition levels for humans
#define NUTRITION_LEVEL_FAT 600
#define NUTRITION_LEVEL_FULL 550
#define NUTRITION_LEVEL_WELL_FED 450
#define NUTRITION_LEVEL_FED 350
Expand Down
2 changes: 0 additions & 2 deletions code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_MUTE "mute"
#define TRAIT_EMOTEMUTE "emotemute"
#define TRAIT_NEARSIGHT "nearsighted"
#define TRAIT_FAT "fat"
#define TRAIT_HUSK "husk"
#define TRAIT_BADDNA "baddna"
#define TRAIT_CLUMSY "clumsy"
Expand Down Expand Up @@ -322,7 +321,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define UNCONSCIOUS_TRAIT "unconscious"
#define EYE_DAMAGE "eye_damage"
#define GENETIC_MUTATION "genetic"
#define OBESITY "obesity"
#define MAGIC_TRAIT "magic"
#define TRAUMA_TRAIT "trauma"
#define DISEASE_TRAIT "disease"
Expand Down
1 change: 0 additions & 1 deletion code/_globalvars/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_EMOTEMUTE " = TRAIT_EMOTEMUTE,
"TRAIT_DEAF" = TRAIT_DEAF,
"TRAIT_NEARSIGHT" = TRAIT_NEARSIGHT,
"TRAIT_FAT" = TRAIT_FAT,
"TRAIT_HUSK" = TRAIT_HUSK,
"TRAIT_BADDNA" = TRAIT_BADDNA,
"TRAIT_CLUMSY" = TRAIT_CLUMSY,
Expand Down
5 changes: 0 additions & 5 deletions code/_onclick/hud/alert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,6 @@ Override makes it so the alert is not replaced until cleared by a clear_alert wi
//End gas alerts


/atom/movable/screen/alert/fat
name = "Fat"
desc = "You ate too much food, lardass. Run around and lose some weight."
icon_state = "fat"

/atom/movable/screen/alert/hungry
name = "Hungry"
desc = "Some food would be good right about now."
Expand Down
7 changes: 1 addition & 6 deletions code/datums/components/mood.dm
Original file line number Diff line number Diff line change
Expand Up @@ -322,12 +322,7 @@
if(HAS_TRAIT(L, TRAIT_NOHUNGER))
return FALSE //no mood events for nutrition
switch(L.nutrition)
if(NUTRITION_LEVEL_FULL to INFINITY)
if (!HAS_TRAIT(L, TRAIT_VORACIOUS))
add_event(null, "nutrition", /datum/mood_event/fat)
else
add_event(null, "nutrition", /datum/mood_event/wellfed) // round and full
if(NUTRITION_LEVEL_WELL_FED to NUTRITION_LEVEL_FULL)
if(NUTRITION_LEVEL_WELL_FED to INFINITY)
add_event(null, "nutrition", /datum/mood_event/wellfed)
if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED)
add_event(null, "nutrition", /datum/mood_event/fed)
Expand Down
2 changes: 0 additions & 2 deletions code/datums/components/tackle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,6 @@
defense_mod -= 1
if(HAS_TRAIT(target, TRAIT_CLUMSY))
defense_mod -= 2
if(HAS_TRAIT(target, TRAIT_FAT)) // chonkers are harder to knock over
defense_mod += 1
if(HAS_TRAIT(target, TRAIT_GRABWEAKNESS))
defense_mod -= 2
if(HAS_TRAIT(target, TRAIT_DWARF))
Expand Down
4 changes: 0 additions & 4 deletions code/datums/mood_events/needs_events.dm
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
//nutrition
/datum/mood_event/fat
description = "<span class='warning'><B>I'm so fat...</B></span>\n" //muh fatshaming
mood_change = -6

/datum/mood_event/wellfed
description = "<span class='nicegreen'>I'm stuffed!</span>\n"
mood_change = 8
Expand Down
Loading

0 comments on commit 4d4aa72

Please sign in to comment.