Skip to content

Commit

Permalink
merge-unconflict
Browse files Browse the repository at this point in the history
  • Loading branch information
ToasterBan committed Apr 7, 2024
1 parent 6ababe4 commit 53ee5c0
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 30 deletions.
2 changes: 1 addition & 1 deletion beestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1709,7 +1709,7 @@
#include "code\modules\actionspeed\_actionspeed_modifier.dm"
#include "code\modules\actionspeed\modifiers\base.dm"
#include "code\modules\actionspeed\modifiers\race.dm"
#include "code\modules\actionspeed\modifiers\hunger"
#include "code\modules\actionspeed\modifiers\hunger.dm"
#include "code\modules\actionspeed\modifiers\status_effects.dm"
#include "code\modules\admin\admin.dm"
#include "code\modules\admin\admin_fax_panel.dm"
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/actionspeed_modification.dm
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
//ids
#define ACTIONSPEED_ID_SATIETY "nutrition_component"
#define ACTIONSPEED_ID_SATIETY "nutrition"
4 changes: 1 addition & 3 deletions code/__DEFINES/movespeed_modification.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define MOVE_CONFLICT_JETPACK "JETPACK"

//ids
#define MOVESPEED_ID_SANITY "sanity_component"
#define MOVESPEED_ID_VISIBLE_HUNGER "VISIBLE_HUNGER"

#define MOVESPEED_ID_MOB_GRAB_STATE "mob_grab_state"
#define MOVESPEED_ID_MOB_WALK_RUN "mob_walk_run"
Expand Down Expand Up @@ -40,8 +40,6 @@

#define MOVESPEED_ID_PAI_SPACEWALK_SPEEDMOD "PAI_SPACEWALK_MODIFIER"

#define MOVESPEED_ID_VISIBLE_HUNGER "VISIBLE_HUNGER"

#define MOVESPEED_ID_PHOBIA "TRAUMA_PHOBIA"

#define MOVESPEED_ID_SPECIES "SPECIES_SPEED_MOD"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
multiplicative_slowdown = 0.25
id = ACTIONSPEED_ID_SATIETY

/datum/actionspeed_modifier/wellfed
/datum/actionspeed_modifier/well_fed
multiplicative_slowdown = -0.1
id = ACTIONSPEED_ID_SATIETY
22 changes: 11 additions & 11 deletions code/modules/mob/living/carbon/human/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1427,41 +1427,41 @@ GLOBAL_LIST_EMPTY(features_by_species)
H.throw_alert("nutrition", /atom/movable/screen/alert/fat)
if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_FULL)
H.clear_alert("nutrition")
H.remove_movespeed_modifier(MOVESPEED_ID_VISIBLE_HUNGER, TRUE)
H.add_actionspeed_modifier(/datum/actionspeed_modifier/wellfed)
H.remove_movespeed_modifier(MOVESPEED_ID_VISIBLE_HUNGER)
H.add_actionspeed_modifier(/datum/actionspeed_modifier/well_fed)
if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FED)
H.clear_alert("nutrition")
H.remove_movespeed_modifier(MOVESPEED_ID_VISIBLE_HUNGER, TRUE)
H.remove_movespeed_modifier(MOVESPEED_ID_VISIBLE_HUNGER)
H.remove_actionspeed_modifier(ACTIONSPEED_ID_SATIETY)
if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY)
H.throw_alert("nutrition", /atom/movable/screen/alert/hungry)
H.add_movespeed_modifier(MOVESPEED_ID_VISIBLE_HUNGER, TRUE, 100, override=TRUE, multiplicative_slowdown=0.2, movetypes=(~FLYING))
H.add_movespeed_modifier(/datum/movespeed_modifier/visible_hunger/hungry)
H.add_actionspeed_modifier(/datum/actionspeed_modifier/starving)
if(0 to NUTRITION_LEVEL_STARVING)
H.throw_alert("nutrition", /atom/movable/screen/alert/starving)
H.add_movespeed_modifier(MOVESPEED_ID_VISIBLE_HUNGER, TRUE, 100, override=TRUE, multiplicative_slowdown=0.6, movetypes=(~FLYING))
H.add_movespeed_modifier(/datum/movespeed_modifier/visible_hunger/starving)
H.add_actionspeed_modifier(/datum/actionspeed_modifier/starving)

/datum/species/proc/handle_charge(mob/living/carbon/human/H)
switch(H.nutrition)
if(NUTRITION_LEVEL_FED to INFINITY)
H.clear_alert("nutrition")
H.remove_movespeed_modifier(MOVESPEED_ID_VISIBLE_HUNGER, TRUE)
H.add_actionspeed_modifier(/datum/actionspeed_modifier/wellfed)
H.remove_movespeed_modifier(MOVESPEED_ID_VISIBLE_HUNGER)
H.add_actionspeed_modifier(/datum/actionspeed_modifier/well_fed)
if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FED)
H.throw_alert("nutrition", /atom/movable/screen/alert/lowcell, 1)
H.remove_movespeed_modifier(MOVESPEED_ID_VISIBLE_HUNGER, TRUE)
H.remove_movespeed_modifier(MOVESPEED_ID_VISIBLE_HUNGER)
H.remove_actionspeed_modifier(ACTIONSPEED_ID_SATIETY)
if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY)
H.throw_alert("nutrition", /atom/movable/screen/alert/lowcell, 2)
H.add_movespeed_modifier(MOVESPEED_ID_VISIBLE_HUNGER, TRUE, 100, override=TRUE, multiplicative_slowdown=0.2, movetypes=(~FLYING))
H.add_movespeed_modifier(/datum/movespeed_modifier/visible_hunger/hungry)
H.add_actionspeed_modifier(/datum/actionspeed_modifier/starving)
if(1 to NUTRITION_LEVEL_STARVING)
H.throw_alert("nutrition", /atom/movable/screen/alert/lowcell, 3)
H.add_movespeed_modifier(MOVESPEED_ID_VISIBLE_HUNGER, TRUE, 100, override=TRUE, multiplicative_slowdown=0.6, movetypes=(~FLYING))
H.add_movespeed_modifier(/datum/movespeed_modifier/visible_hunger/starving)
H.add_actionspeed_modifier(/datum/actionspeed_modifier/starving)
else
H.add_movespeed_modifier(MOVESPEED_ID_VISIBLE_HUNGER, TRUE, 100, override=TRUE, multiplicative_slowdown=0.7, movetypes=(~FLYING))
H.add_movespeed_modifier(/datum/movespeed_modifier/visible_hunger/starving)
H.add_actionspeed_modifier(/datum/actionspeed_modifier/starving)
var/obj/item/organ/stomach/battery/battery = H.getorganslot(ORGAN_SLOT_STOMACH)
if(!istype(battery))
Expand Down
13 changes: 0 additions & 13 deletions code/modules/movespeed/modifiers/components.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,3 @@
/datum/movespeed_modifier/snail_crawl
multiplicative_slowdown = -7
movetypes = GROUND

/datum/movespeed_modifier/sanity
id = MOVESPEED_ID_SANITY
movetypes = (~FLYING)

/datum/movespeed_modifier/sanity/insane
multiplicative_slowdown = 0.6

/datum/movespeed_modifier/sanity/crazy
multiplicative_slowdown = 0.3

/datum/movespeed_modifier/sanity/disturbed
multiplicative_slowdown = 0.15
10 changes: 10 additions & 0 deletions code/modules/movespeed/modifiers/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,13 @@
/datum/movespeed_modifier/nopowercell
multiplicative_slowdown = 1.5
blacklisted_movetypes = FLOATING

/datum/movespeed_modifier/visible_hunger
id = MOVESPEED_ID_VISIBLE_HUNGER
movetypes = (~FLYING)

/datum/movespeed_modifier/visible_hunger/starving
multiplicative_slowdown = 0.6

/datum/movespeed_modifier/visible_hunger/hungry
multiplicative_slowdown = 0.2

0 comments on commit 53ee5c0

Please sign in to comment.