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 10:25:42 -04: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/living/carbon/human/species.dm
+3
View File
@@ -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)
code/modules/mob/living/ventcrawling.dm
+1 -2
View File
@@ -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(.)
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)
code/modules/paperwork/photocopier.dm
+2
View File
@@ -135,6 +135,8 @@
p.pixel_x = rand(-10, 10)
p.pixel_y = rand(-10, 10)
p.picture = new(null, "You see [ass]'s ass on the photo.", temp_img)
p.picture.psize_x = 128
p.picture.psize_y = 128
p.update_icon()
toner -= 5
busy = TRUE
code/modules/projectiles/guns/energy.dm
+1 -1
View File
@@ -135,7 +135,7 @@
..()
if(!automatic_charge_overlays)
return
var/ratio = CEILING((cell.charge / cell.maxcharge) * charge_sections, 1)
var/ratio = CEILING(CLAMP(cell.charge / cell.maxcharge, 0, 1) * charge_sections, 1)
if(ratio == old_ratio && !force_update)
return
old_ratio = ratio
code/modules/projectiles/guns/misc/beam_rifle.dm
+1 -1
View File
@@ -539,7 +539,7 @@
if(check_pierce(target))
permutated += target
trajectory_ignore_forcemove = TRUE
forceMove(target)
forceMove(target.loc)
trajectory_ignore_forcemove = FALSE
return FALSE
if(!QDELETED(target))