shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update slab_abilities.dm

Browse Source
This commit is contained in:
deathride58
2017-12-07 19:32:39 -05:00
committed by GitHub
parent 0ae0c44991
commit 6432d2c86c
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm
+1 -5
View File
@@ -65,13 +65,9 @@
/obj/item/restraints/handcuffs/clockwork
name = "replicant manacles"
<<<<<<< HEAD
desc = "Cold, heavy manacles made out of some strange black metal."
origin_tech = "materials=2;magnets=5"
=======
desc = "Heavy manacles made out of freezing-cold metal. It looks like brass, but feels much more solid."
icon_state = "brass_manacles"
>>>>>>> 32c68a6... Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more (#32935)
origin_tech = "materials=2;magnets=5"
flags_1 = DROPDEL_1
/obj/item/restraints/handcuffs/clockwork/dropped(mob/user)