Merge branch 'master' into master

2019-06-29 15:48:25 +01:00
parent 7be7f05228 c3ae7e5522
commit 696d879874
158 changed files with 3775 additions and 2492 deletions
@@ -94,3 +94,9 @@
 		H.dna.features["ears"] = "None"
 		H.dna.species.mutant_bodyparts -= "ears"
 		H.update_body()
+
+/obj/item/organ/ears/bronze
+	name = "tin ears"
+	desc = "The robust ears of a bronze golem. "
+	damage_multiplier = 0.1 //STRONK
+	bang_protect = 1 //Fear me weaklings.