Upstream bugfix mirror spree (#7541)
* 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:
@@ -1381,6 +1381,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
|
||||
target.visible_message("<span class='danger'>[user] has [atk_verb]ed [target]!</span>", \
|
||||
"<span class='userdanger'>[user] has [atk_verb]ed [target]!</span>", null, COMBAT_MESSAGE_RANGE)
|
||||
|
||||
target.lastattacker = user.real_name
|
||||
target.lastattackerckey = user.ckey
|
||||
|
||||
if(user.limb_destroyer)
|
||||
target.dismembering_strike(user, affecting.body_zone)
|
||||
target.apply_damage(damage, BRUTE, affecting, armor_block)
|
||||
|
||||
@@ -57,7 +57,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list(
|
||||
|
||||
if(iscarbon(src) && ventcrawler < 2)//It must have atleast been 1 to get this far
|
||||
var/failed = 0
|
||||
var/list/items_list = get_equipped_items()
|
||||
var/list/items_list = get_equipped_items(include_pockets = TRUE)
|
||||
if(items_list.len)
|
||||
failed = 1
|
||||
for(var/obj/item/I in held_items)
|
||||
@@ -120,4 +120,3 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list(
|
||||
. = new_loc
|
||||
remove_ventcrawl()
|
||||
add_ventcrawl(.)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user