Merge pull request #4407 from Fox-McCloud/no-guns

Refactors Species Gun Handling
This commit is contained in:
TheDZD
2016-05-10 22:46:52 -04:00
6 changed files with 14 additions and 14 deletions
@@ -6,7 +6,7 @@
deform = 'icons/mob/human_races/r_golem.dmi'
default_language = "Galactic Common"
flags = NO_BREATHE | NO_BLOOD | RADIMMUNE
flags = NO_BREATHE | NO_BLOOD | RADIMMUNE | NOGUNS
virus_immune = 1
dietflags = DIET_OMNI //golems can eat anything because they are magic or something
reagent_tag = PROCESS_ORG
@@ -34,8 +34,6 @@
brute_mod = 1.5
burn_mod = 1.5
flags = IS_RESTRICTED
/datum/species/monkey/handle_npc(var/mob/living/carbon/human/H)
if(H.stat != CONSCIOUS)
return
+2 -5
View File
@@ -134,11 +134,8 @@
return
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.get_species() == "Golem")
to_chat(user, "<span class='danger'>Your metal fingers don't fit in the trigger guard!</span>")
return
if(H.get_species() == "Shadowling")
to_chat(user, "<span class='danger'>The muzzle flash would cause damage to your form!</span>")
if(H.species.flags & NOGUNS)
to_chat(user, "<span class='warning'>Your fingers don't fit in the trigger guard!</span>")
return
if(H.martial_art && H.martial_art.name == "The Sleeping Carp") //great dishonor to famiry
to_chat(user, "<span class='danger'>Use of ranged weaponry would bring dishonor to the clan.</span>")