mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Runtime fixes (#11419)
This commit is contained in:
@@ -77,20 +77,21 @@
|
||||
force_wielded = 75
|
||||
slowdown = 0
|
||||
|
||||
/obj/item/material/twohanded/sledgehammer/mjollnir/afterattack(mob/living/G, mob/user)
|
||||
/obj/item/material/twohanded/sledgehammer/mjollnir/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity)
|
||||
..()
|
||||
|
||||
if(wielded)
|
||||
if(proximity && wielded && isliving(A))
|
||||
var/mob/living/target = A
|
||||
if(prob(10))
|
||||
G.electrocute_act(500, src, def_zone = BP_TORSO)
|
||||
target.electrocute_act(500, src, def_zone = BP_TORSO)
|
||||
return
|
||||
if(prob(10))
|
||||
G.dust()
|
||||
target.dust()
|
||||
return
|
||||
else
|
||||
G.stun_effect_act(10 , 50, BP_TORSO, src)
|
||||
G.take_organ_damage(10)
|
||||
G.Paralyse(20)
|
||||
target.stun_effect_act(10 , 50, BP_TORSO, src)
|
||||
target.take_organ_damage(10)
|
||||
target.Paralyse(20)
|
||||
playsound(src.loc, "sparks", 50, 1)
|
||||
return
|
||||
|
||||
|
||||
@@ -4,6 +4,10 @@
|
||||
|
||||
var/datum/paiCandidate/candidate
|
||||
|
||||
/datum/category_item/player_setup_item/general/basic_antagonism/New()
|
||||
. = ..()
|
||||
candidate = new()
|
||||
|
||||
/datum/category_item/player_setup_item/general/basic_antagonism/load_character(list/save_data)
|
||||
pref.exploit_record = save_data["exploit_record"]
|
||||
pref.antag_faction = save_data["antag_faction"]
|
||||
@@ -17,6 +21,7 @@
|
||||
/datum/category_item/player_setup_item/general/basic_antagonism/load_preferences(datum/json_savefile/savefile)
|
||||
if(!candidate)
|
||||
candidate = new()
|
||||
|
||||
var/preference_mob = preference_mob()
|
||||
if(!preference_mob)// No preference mob - this happens when we're called from client/New() before it calls ..() (via datum/preferences/New())
|
||||
spawn()
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
|
||||
var/obj/item/grenade/G = new grenade_type2(get_turf(src))
|
||||
if(istype(G))
|
||||
G.throw_at(G.throw_range, G.throw_speed, src)
|
||||
G.throw_at(target, G.throw_range, G.throw_speed, src)
|
||||
G.det_time = grenade_timer
|
||||
G.activate(src)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user