Fixing Charging bugs and Breeder bugs (#1296)

Breeders now need to breathe again.
Sanity check for any gun that requires charging has been added. It's not been added to the master special_check and firing procs yet because weapons that need to charge remain fairly edge case.
This commit is contained in:
LordFowl
2016-12-25 20:50:12 +02:00
committed by skull132
parent 93600f51b5
commit f1897e2ffb
5 changed files with 43 additions and 21 deletions
@@ -284,8 +284,14 @@
src << "<span class='warning'>You cannot do that in your current state.</span>"
return
var/obj/item/weapon/grab/G = get_aggressive_grab()
if(!G) return
var/obj/item/weapon/grab/G = src.get_active_hand()
if(!istype(G))
src << "<span class='warning'>We must be grabbing a creature in our active hand to devour their head.</span>"
return
if(G.state != GRAB_KILL)
src << "<span class='warning'>We must have a tighter grip to devour their head.</span>"
return
if(istype(G.affecting,/mob/living/carbon/human))
var/mob/living/carbon/human/H = G.affecting
@@ -300,9 +306,9 @@
return
visible_message("<span class='danger'>\The [src] pulls \the [H] close, sticking \the [H]'s head into its maw!</span>")
sleep(50)
get_aggressive_grab()
if(!G) return
sleep(10)
if(!src.Adjacent(G.affecting))
return
visible_message("<span class='danger'>\The [src] closes their jaws around \the [H]'s head!</span>")
playsound(H.loc, 'sound/effects/blobattack.ogg', 50, 1)
affecting.droplimb(0, DROPLIMB_BLUNT)
@@ -49,9 +49,6 @@
brute_mod = 0.2 //note to self: remove is_synthetic checks for brmod and burnmod
burn_mod = 0.8 //2x was a bit too much. we'll see how this goes.
toxins_mod = 1 //they're not used to all our weird human bacteria.
warning_low_pressure = 50
hazard_low_pressure = 0
ethanol_resistance = 2
speech_sounds = list('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg')
speech_chance = 100
@@ -66,10 +63,8 @@
sprint_cost_factor = 0.80
stamina_recovery = 3
vision_flags = SEE_SELF
spawn_flags = IS_RESTRICTED
flags = NO_SCAN | HAS_SKIN_COLOR | NO_SLIP
flags = NO_SCAN | NO_SLIP | NO_MINOR_CUT
inherent_verbs = list(
/mob/living/carbon/human/proc/bugbite,
@@ -78,10 +73,6 @@
)
/datum/species/bug/type_c/equip_survival_gear(var/mob/living/carbon/human/H)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/typec(H),slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/typec(H), slot_wear_mask)
H.equip_to_slot_or_del(new /obj/item/clothing/under/gearharness(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/typec(H), slot_back)
return
/datum/species/bug/type_c/handle_post_spawn(var/mob/living/carbon/human/H)