fix (#485)

vlggms · Oct 28, 2023 · 2f2f7ec · 2f2f7ec
1 parent 7b5a616
commit 2f2f7ec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/code/game/objects/items/devices/microlaser_radioactive.dm b/code/game/objects/items/devices/microlaser_radioactive.dm
@@ -1,3 +1,5 @@
+// THE RADIOACTIVE MICROLASER
+
 /obj/item/device/scanner/health/radioactive_microlaser //a health scanner that will give you aids and radiation
 	origin_tech = list(TECH_MATERIAL = 2, TECH_ESOTERIC = 5)
 	var/rads = 100
@@ -7,9 +9,10 @@
 
 /obj/item/device/scanner/health/radioactive_microlaser/examine(mob/user, distance)
 	. = ..()
-	if(istraitor(user) || user.skill_check(SKILL_MEDICAL, SKILL_TRAINED) || user.skill_check(SKILL_DEVICES, SKILL_TRAINED))
-		to_chat(user, "It might seem like a normal health analyzer, but you noticed a few differences here and there.")
-		to_chat(user, "There's a dial on the side, it seems to be set to the number [microlaserLevel]. You can use <b>alt-click</b> to change the level.")
+	if(distance <= 1)
+		if(istraitor(user) || user.skill_check(SKILL_MEDICAL, SKILL_TRAINED) || user.skill_check(SKILL_DEVICES, SKILL_TRAINED))
+			to_chat(user, "It might seem like a normal health analyzer, but you noticed a few differences here and there.")
+			to_chat(user, SPAN_NOTICE("There's a dial on the side, it seems to be set to the number [microlaserLevel]. You can use <b>alt-click</b> to change the level."))
 
 /obj/item/device/scanner/health/radioactive_microlaser/scan(atom/A, mob/user)
 	. = ..()

diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm
@@ -15,7 +15,7 @@
 	throw_range = 7
 	w_class = ITEM_SIZE_LARGE //its a damn power fist, its big
 	var/fist_pressure_setting = LOW_PRESSURE
-	var/gas_per_fist = 20 //amount of shit to use on pawnch, scales with pressure setting
+	var/gas_per_fist = 8 //amount of shit to use on pawnch, scales with pressure setting
 	var/obj/item/tank/tank
 
 /obj/item/melee/powerfist/proc/pressure_setting_to_text(fist_pressure_setting)
@@ -68,9 +68,9 @@
 		return
 
 /obj/item/melee/powerfist/attack(mob/living/M, mob/living/user, target_zone, animate)
-	. = ..()
 	if(!user.a_intent == I_HURT)
 		return
+	. = ..()
 	if(!tank)
 		to_chat(user, SPAN_WARNING("\The [src] doesn't have a tank!"))
 		return