From 6432d2c86c6ebb5f241a305e275eb926ceed1e60 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Thu, 7 Dec 2017 19:32:39 -0500 Subject: [PATCH] Update slab_abilities.dm --- .../gamemodes/clock_cult/clock_helpers/slab_abilities.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm b/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm index 45065cd757..ef7d70c72e 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm @@ -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)