tackle and puddle
This commit is contained in:
@@ -89,6 +89,11 @@
|
|||||||
to_chat(user, "<span class='warning'>You can't tackle while tased!</span>")
|
to_chat(user, "<span class='warning'>You can't tackle while tased!</span>")
|
||||||
return
|
return
|
||||||
|
|
||||||
|
left_paralysis = HAS_TRAIT(sacker, TRAIT_PARALYSIS_L_ARM)
|
||||||
|
right_paralysis = HAS_TRAIT(sacker, TRAIT_PARALYSIS_R_ARM)
|
||||||
|
if(left && right_paralysis)
|
||||||
|
to_chat(user, "<span class='warning'>You can't tackle without the use of your arms!</span>")
|
||||||
|
|
||||||
user.face_atom(A)
|
user.face_atom(A)
|
||||||
|
|
||||||
var/list/modifiers = params2list(params)
|
var/list/modifiers = params2list(params)
|
||||||
@@ -280,6 +285,10 @@
|
|||||||
attack_mod -= 2
|
attack_mod -= 2
|
||||||
if(HAS_TRAIT(sacker, TRAIT_GIANT))
|
if(HAS_TRAIT(sacker, TRAIT_GIANT))
|
||||||
attack_mod += 2
|
attack_mod += 2
|
||||||
|
left_paralysis = HAS_TRAIT(sacker, TRAIT_PARALYSIS_L_ARM)
|
||||||
|
right_paralysis = HAS_TRAIT(sacker, TRAIT_PARALYSIS_R_ARM)
|
||||||
|
if(left_paralysis || right_paralysis)
|
||||||
|
attack_mod -= 2
|
||||||
|
|
||||||
if(ishuman(target))
|
if(ishuman(target))
|
||||||
var/mob/living/carbon/human/S = sacker
|
var/mob/living/carbon/human/S = sacker
|
||||||
|
|||||||
@@ -62,7 +62,6 @@
|
|||||||
|
|
||||||
H.add_movespeed_modifier(/datum/movespeed_modifier/slime_puddle)
|
H.add_movespeed_modifier(/datum/movespeed_modifier/slime_puddle)
|
||||||
|
|
||||||
H.layer -= 1 //go one layer down so people go over you
|
|
||||||
ENABLE_BITFIELD(H.pass_flags, PASSMOB) //this actually lets people pass over you
|
ENABLE_BITFIELD(H.pass_flags, PASSMOB) //this actually lets people pass over you
|
||||||
squeak = H.AddComponent(/datum/component/squeak, custom_sounds = list('sound/effects/blobattack.ogg')) //blorble noise when people step on you
|
squeak = H.AddComponent(/datum/component/squeak, custom_sounds = list('sound/effects/blobattack.ogg')) //blorble noise when people step on you
|
||||||
|
|
||||||
@@ -103,7 +102,6 @@
|
|||||||
REMOVE_TRAIT(H, TRAIT_HUMAN_NO_RENDER, SLIMEPUDDLE_TRAIT)
|
REMOVE_TRAIT(H, TRAIT_HUMAN_NO_RENDER, SLIMEPUDDLE_TRAIT)
|
||||||
H.update_disabled_bodyparts(silent = TRUE)
|
H.update_disabled_bodyparts(silent = TRUE)
|
||||||
H.remove_movespeed_modifier(/datum/movespeed_modifier/slime_puddle)
|
H.remove_movespeed_modifier(/datum/movespeed_modifier/slime_puddle)
|
||||||
H.layer += 1 //go one layer back above!
|
|
||||||
DISABLE_BITFIELD(H.pass_flags, PASSMOB)
|
DISABLE_BITFIELD(H.pass_flags, PASSMOB)
|
||||||
is_puddle = FALSE
|
is_puddle = FALSE
|
||||||
if(squeak)
|
if(squeak)
|
||||||
|
|||||||
Reference in New Issue
Block a user