cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Golems Are Now a Proper Race (#9274)

Browse Source 
* Adds golems as a proper race.

* Adds golem name file.

* Fixes a couple names.

* Further fixes to names.

* Changes the golem language key from g to p.

* Adds groin states for golems, as well as deformed states for all golem limbs.

* Changes attack verb to "punches." Updates the changelog with more complete information as to the golems' capabilities.

* Adds some extra checks for golems. Golems can now walk over broken glass barefoot without being hurt.

* Fixes new macros.
This commit is contained in:
Shadowmech88
2016-04-15 02:44:08 -05:00
committed by clusterfack
parent cbb4370dac
commit d8674e9320
34 changed files with 248 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/projectiles/gun.dm
View File

@@ -107,7 +107,7 @@
if(ishuman(user))
var/mob/living/carbon/human/H=user
if(golem_check)
if(user.dna && (user.dna.mutantrace == "adamantine" || user.dna.mutantrace=="coalgolem"))
if(isgolem(H) || (H.dna && (H.dna.mutantrace == "adamantine" || H.dna.mutantrace=="coalgolem"))) //leaving the mutantrace checks in just in case
if(display_message)
to_chat(user, "<span class='warning'>Your fat fingers don't fit in the trigger guard!</span>")
return 0