cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 07:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1148 from ariaworld/comfy-erp

Browse Source 
[QOL] No hunger/thirst loss for standing still after 5 minutes! (for ERP) + Allows Protolathe-printing 30 stock parts at once.
This commit is contained in:
BongaTheProto
2024-05-16 21:57:38 -05:00
committed by GitHub
parent 3d8d1c98df a362ddfc61
commit acdaea9e76
6 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1618,8 +1618,19 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
//
H.update_inv_wear_suit()
//SPLURT: If you haven't walked into a different tile in 5 minutes, don't drain hunger/thirst.
if(H.client && (((world.time - H.client?.last_move)) > 5 MINUTES))
if(!H.insanelycomfy)
to_chat(H, span_notice("You feel comfy."))
H.insanelycomfy = TRUE
else if(H.insanelycomfy)
to_chat(H, span_notice("You no longer feel comfy."))
H.insanelycomfy = FALSE
//SPLURT ADDITION
// nutrition decrease and satiety
if (H.nutrition > 0 && H.stat != DEAD && !HAS_TRAIT(H, TRAIT_NOHUNGER))
if (H.nutrition > 0 && H.stat != DEAD && !HAS_TRAIT(H, TRAIT_NOHUNGER) && !H.insanelycomfy)
// THEY HUNGER
var/hunger_rate = HUNGER_FACTOR
var/datum/component/mood/mood = H.GetComponent(/datum/component/mood)

2
code/modules/projectiles/projectile/beams.dm
View File

@@ -108,7 +108,7 @@
/obj/item/projectile/beam/pulse/on_hit(atom/target, blocked = FALSE)
. = ..()
if (!QDELETED(target) && (isturf(target) || istype(target, /obj/structure/)))
if (!QDELETED(target) && (isturf(target) || istype(target, /obj/structure)))
target.ex_act(EXPLODE_HEAVY)
/obj/item/projectile/beam/pulse/shotgun

3
code/modules/research/machinery/_production.dm
View File

@@ -305,6 +305,9 @@
l += "<A href='?src=[REF(src)];build=[D.id];amount=5'>x5</A>[RDSCREEN_NOBREAK]"
if(c >= 10)
l += "<A href='?src=[REF(src)];build=[D.id];amount=10'>x10</A>[RDSCREEN_NOBREAK]"
//SPLURT EDIT: Print x30 stock parts at once
if(c >= 30 && selected_category == "Stock Parts")
l += "<A href='?src=[REF(src)];build=[D.id];amount=30'>x30</A>[RDSCREEN_NOBREAK]"
l += "[temp_material][sec_text][RDSCREEN_NOBREAK]"
else
l += "<span class='linkOff'>[D.name]</span>[temp_material][sec_text][RDSCREEN_NOBREAK]"

3
code/modules/research/rdconsole.dm
View File

@@ -376,6 +376,9 @@ Nothing else in the console has ID requirements.
l += "<A href='?src=[REF(src)];build=[D.id];amount=5'>x5</A>[RDSCREEN_NOBREAK]"
if(c >= 10)
l += "<A href='?src=[REF(src)];build=[D.id];amount=10'>x10</A>[RDSCREEN_NOBREAK]"
//SPLURT EDIT: Print x30 stock parts at once
if(c >= 30 && selected_category == "Stock Parts")
l += "<A href='?src=[REF(src)];build=[D.id];amount=30'>x30</A>[RDSCREEN_NOBREAK]"
l += "[temp_material][RDSCREEN_NOBREAK]"
else
l += "<span class='linkOff'>[D.name]</span>[temp_material][RDSCREEN_NOBREAK]"

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

@@ -26,7 +26,7 @@
return
// A lot of this is just copied and pasted from the handle_digestion proc
if (H.thirst > 0 && H.stat != DEAD && !HAS_TRAIT(H, TRAIT_NOTHIRST))
if (H.thirst > 0 && H.stat != DEAD && !HAS_TRAIT(H, TRAIT_NOTHIRST) && !H.insanelycomfy)
// THEY ~~HUNGER~~ THIRST
var/thirst_rate = THIRST_FACTOR
/*

4
modular_splurt/code/modules/mob/mob.dm
View File

@@ -1,5 +1,9 @@
#define PROTOLOCK_ALL_ACCESS CONFIG_GET(flag/protolock_all_access)
/mob/living/carbon/human
///This player has been standing still for very long and are probably roleplaying. They won't use up nutrition/thirst until they start moving again.
var/insanelycomfy = FALSE
/mob/Initialize()
. = ..()
create_player_panel()