diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 54f6e3e952..cb0e754450 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1381,6 +1381,9 @@ GLOBAL_LIST_EMPTY(roundstart_races) target.visible_message("[user] has [atk_verb]ed [target]!", \ "[user] has [atk_verb]ed [target]!", 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) diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm index 2d3ed3d669..600fa581cb 100644 --- a/code/modules/mob/living/ventcrawling.dm +++ b/code/modules/mob/living/ventcrawling.dm @@ -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(.) - diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm index f031f77351..4c23279a9a 100644 --- a/code/modules/mob/status_procs.dm +++ b/code/modules/mob/status_procs.dm @@ -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) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 2a880b670c..b8fac81df8 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -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 diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index be25a13734..6020a0b945 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -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 diff --git a/code/modules/projectiles/guns/misc/beam_rifle.dm b/code/modules/projectiles/guns/misc/beam_rifle.dm index e00d5263e0..98469ebc31 100644 --- a/code/modules/projectiles/guns/misc/beam_rifle.dm +++ b/code/modules/projectiles/guns/misc/beam_rifle.dm @@ -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))