cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-09 23:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

More Tweaks

Browse Source
This commit is contained in:
SomeGuyEatingPie
2022-08-12 17:58:40 +01:00
parent 87ff5c408d
commit d40fe630dc
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
GainStation13/code/obj/structure/scale.dm
View File

@@ -12,6 +12,8 @@
layer = OBJ_LAYER
//stores the weight of the last person to step on in Lbs
var/lastreading = 0
//the conversion ratio for how much a point of fatness weighs on a 6' person
var/fatnessToWeight = 0.25
/obj/structure/scale/deconstruct()
// If we have materials, and don't have the NOCONSTRUCT flag
@@ -68,7 +70,7 @@
weighperson(HM)
/obj/structure/scale/proc/weighperson(mob/living/carbon/human/fatty)
src.lastreading = round((140 + (fatty.fatness/2))*(fatty.size_multiplier**2))
src.lastreading = round((140 + (fatty.fatness/src.fatnessToWeight))*(fatty.size_multiplier**2))
weighEffect(fatty)
visible_message("<span class='notice'>[fatty] weighs themselves.</span>")
visible_message("<span class='notice'>The numbers on the screen settle on: [src.lastreading]Lbs.</span>")

2
_maps/map_files/MetaStation/MetaStation.dmm
View File

@@ -3759,7 +3759,7 @@
"buJ" = (/obj/effect/turf_decal/tile/blue{dir = 4},/obj/machinery/newscaster{pixel_x = 28; pixel_y = 1},/turf/open/floor/plasteel/white/corner,/area/hallway/secondary/entry)
"buK" = (/obj/structure/chair/comfy{dir = 4},/turf/open/floor/plasteel/grimy,/area/hallway/primary/port)
"buL" = (/obj/structure/chair/comfy{dir = 8},/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/grimy,/area/hallway/primary/port)
"buM" = (/obj/machinery/vending/mealdor,/obj/machinery/vending/mealdor,/turf/open/floor/plasteel/dark,/area/hallway/primary/port)
"buM" = (/obj/machinery/vending/mealdor,/turf/open/floor/plasteel/dark,/area/hallway/primary/port)
"buN" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/disposalpipe/segment,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/port)
"buO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{icon_state = "1-2"},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel,/area/hallway/primary/port)
"buP" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -28},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/port)

10
code/__DEFINES/mobs.dm
View File

@@ -157,11 +157,11 @@
#define FULLNESS_LEVEL_EMPTY 0
//Fatness levels, Here we go!
#define FATNESS_LEVEL_BLOB 1720
#define FATNESS_LEVEL_IMMOBILE 920
#define FATNESS_LEVEL_MORBIDLY_OBESE 620
#define FATNESS_LEVEL_OBESE 220
#define FATNESS_LEVEL_FAT 100
#define FATNESS_LEVEL_BLOB 3440
#define FATNESS_LEVEL_IMMOBILE 1840
#define FATNESS_LEVEL_MORBIDLY_OBESE 1240
#define FATNESS_LEVEL_OBESE 440
#define FATNESS_LEVEL_FAT 200
//Nutrition levels for humans
#define NUTRITION_LEVEL_FULL 550

2
code/modules/mob/living/carbon/human/species.dm
View File

@@ -1332,7 +1332,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if (H.nutrition > NUTRITION_LEVEL_FULL)
var/fatConversionRate = 15 //GS13 what percentage of the excess nutrition should go to fat (total nutrition to transfer can't be under 1)
var/fatConversionRate = 100 //GS13 what percentage of the excess nutrition should go to fat (total nutrition to transfer can't be under 1)
var/nutritionThatBecomesFat = max((H.nutrition - NUTRITION_LEVEL_FULL)*(fatConversionRate / 100),1)
H.nutrition -= nutritionThatBecomesFat
H.fatness += nutritionThatBecomesFat