shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream bugfix mirror spree (#7541)

Browse Source 
* tgstation/tgstation#40061 - Fixes mobs getting stuck at min/max body temperature

* tgstation/tgstation#40043 - fixes beam rifles opening lockers

* tgstation/tgstation#40041 - Pictures of asses are properly sized now

* tgstation/tgstation#40084 - fixes lastattacker not including unarmed attacks

* tgstation/tgstation#39968 - Fixes plastic golems ventcrawling with items in pockets

* tgstation/tgstation#39885 - Fix overcharging energy guns crashing the server
This commit is contained in:
deathride58
2018-09-07 07:25:42 -07:00
committed by kevinz000
parent c0389e4fff
commit 7650bac441
6 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/status_procs.dm
+1 -1
View File
@@ -256,5 +256,5 @@
/////////////////////////////////// TEMPERATURE ////////////////////////////////////
/mob/proc/adjust_bodytemperature(amount,min_temp=0,max_temp=INFINITY)
if(bodytemperature > min_temp && bodytemperature < max_temp)
if(bodytemperature >= min_temp && bodytemperature <= max_temp)
bodytemperature = CLAMP(bodytemperature + amount,min_temp,max_temp)