[MIRROR] Adds some custom force strings and fixes a bug (#1700)

* Adds some custom force strings and fixes a bug

* Delete clown_items.dm.rej
This commit is contained in:
CitadelStationBot
2017-06-30 21:17:26 -07:00
committed by kevinz000
parent 259d773cec
commit 5181326d54
6 changed files with 9 additions and 1 deletions
@@ -14,6 +14,7 @@
origin_tech = "combat=4;bluespace=4;plasmatech=7"
armor = list(melee = 50, bullet = 50, laser = 50, energy = 0, bomb = 50, bio = 0, rad = 0, fire = 100, acid = 100)
resistance_flags = FIRE_PROOF | ACID_PROOF
force_string = "LORD SINGULOTH HIMSELF"
/obj/item/weapon/twohanded/singularityhammer/New()
..()