cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 11:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14384 from Runa-Dacino/Custom-species-heat

Browse Source 
Adds ability to customize discomfort
This commit is contained in:
Heroman3003
2023-01-29 08:12:30 +10:00
committed by GitHub
parent 0edbc8e13f 9f25eb73c9
commit f37df09d38
5 changed files with 91 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/species_getters.dm
+10 -2
View File
@@ -90,10 +90,18 @@
*/
var/discomfort_message
var/list/custom_cold = H.custom_cold
var/list/custom_heat = H.custom_heat
if(msg_type == ENVIRONMENT_COMFORT_MARKER_COLD && length(cold_discomfort_strings) /*&& !covered*/)
discomfort_message = pick(cold_discomfort_strings)
if(custom_cold.len > 0)
discomfort_message = pick(custom_cold)
else
discomfort_message = pick(cold_discomfort_strings)
else if(msg_type == ENVIRONMENT_COMFORT_MARKER_HOT && length(heat_discomfort_strings) /*&& covered*/)
discomfort_message = pick(heat_discomfort_strings)
if(custom_heat.len > 0)
discomfort_message = pick(custom_heat)
else
discomfort_message = pick(heat_discomfort_strings)
if(discomfort_message && prob(5))
to_chat(H, SPAN_DANGER(discomfort_message))
code/modules/mob/living/living_defines_vr.dm
+4 -1
View File
@@ -10,4 +10,7 @@
var/custom_say = null
var/custom_ask = null
var/custom_exclaim = null
var/custom_whisper = null
var/custom_whisper = null
//custom temperature discomfort vars
var/list/custom_heat = list()
var/list/custom_cold = list()