Refactors ears into organs (#513)

* Refactors ear damage into ear organs

* Update human.dm

* Update species.dm

* Delete species.dm.rej

* Update tgstation.dme

* Delete tgstation.dme.rej

* Delete human.dm.rej

* Update tongue.dm

* Delete surgery.dmi

* upload fixed surgery.dmi
This commit is contained in:
CitadelStationBot
2017-04-26 09:52:35 -05:00
committed by Poojawa
parent a905c15dad
commit 84321916a5
40 changed files with 925 additions and 908 deletions
+7 -10
View File
@@ -105,7 +105,7 @@
throw_speed = 3
throw_range = 7
attack_verb = list("HONKED")
var/spam_flag = 0
var/next_usable = 0
var/honksound = 'sound/items/bikehorn.ogg'
var/cooldowntime = 20
@@ -115,18 +115,15 @@
return (BRUTELOSS)
/obj/item/weapon/bikehorn/attack(mob/living/carbon/M, mob/living/carbon/user)
if(!spam_flag)
if(!(next_usable > world.time))
playsound(loc, honksound, 50, 1, -1) //plays instead of tap.ogg!
return ..()
/obj/item/weapon/bikehorn/attack_self(mob/user)
if(!spam_flag)
spam_flag = 1
if(!(next_usable > world.time))
next_usable = world.time + cooldowntime
playsound(src.loc, honksound, 50, 1)
src.add_fingerprint(user)
spawn(cooldowntime)
spam_flag = 0
return
/obj/item/weapon/bikehorn/Crossed(mob/living/L)
if(isliving(L))
@@ -156,12 +153,12 @@
..()
/obj/item/weapon/bikehorn/golden/proc/flip_mobs(mob/living/carbon/M, mob/user)
if (!spam_flag)
if(!(next_usable > world.time))
var/turf/T = get_turf(src)
for(M in ohearers(7, T))
if(ishuman(M))
if(ishuman(M) && M.can_hear())
var/mob/living/carbon/human/H = M
if((istype(H.ears, /obj/item/clothing/ears/earmuffs)) || H.ear_deaf)
if(istype(H.ears, /obj/item/clothing/ears/earmuffs))
continue
M.emote("flip")