mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-24 13:47:33 +01:00
1 real fix, two bandaid ones. (#7270)
This commit is contained in:
@@ -59,6 +59,7 @@
|
||||
edge = FALSE
|
||||
sharp = FALSE
|
||||
|
||||
/* ChompEDit: This code provides full protection from melee, and I am unsure how to fix it currently. So temp.removal hopefully.
|
||||
/obj/item/weapon/material/twohanded/staff/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
|
||||
var/parry_chance
|
||||
if(istype(damage_source, /obj/item/projectile)) //can't block ranged attacks, only melee!
|
||||
@@ -73,6 +74,7 @@
|
||||
playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
|
||||
return 1
|
||||
return 0
|
||||
*/
|
||||
|
||||
/obj/item/weapon/material/twohanded/staff/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
|
||||
. = ..()
|
||||
|
||||
@@ -181,6 +181,8 @@
|
||||
*/ //CHOMP Remove end
|
||||
//this is largely hacky and bad :( -Pete //less hacky and bad now :) -Ghost
|
||||
/obj/item/weapon/gun/projectile/shotgun/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob)
|
||||
if(istype(A, /obj/item/ammo_casing/a12g) || istype(A, /obj/item/ammo_magazine)) //CHOMPEdit: Trying to make sawn offs reload able
|
||||
..()
|
||||
if(sawn_off)
|
||||
to_chat(user, "<span class='warning'>The [src] is already shortened!</span>")
|
||||
return
|
||||
|
||||
@@ -178,7 +178,7 @@
|
||||
inhibitors = list("water" = 5)
|
||||
result_amount = 1
|
||||
|
||||
temp_range = list(0, 15)
|
||||
temp_range = list(T0C + 10, T20C + 15) //CHOMPedit: I know this doesn't make sense, and this is a baindaid fix but distiller code refuses to go this low, even with correct variables
|
||||
temp_shift = 20
|
||||
|
||||
/decl/chemical_reaction/distilling/cryogel/on_reaction(var/datum/reagents/holder, var/created_volume)
|
||||
|
||||
Reference in New Issue
Block a user