From 86d11b3bce25007d31c0a59c5e5b8bf1f0d36465 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Fri, 2 Jun 2017 21:54:49 -0700 Subject: [PATCH] Delete cardboard_cutouts.dm.rej --- code/game/objects/items/cardboard_cutouts.dm.rej | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 code/game/objects/items/cardboard_cutouts.dm.rej diff --git a/code/game/objects/items/cardboard_cutouts.dm.rej b/code/game/objects/items/cardboard_cutouts.dm.rej deleted file mode 100644 index c2f19567c7..0000000000 --- a/code/game/objects/items/cardboard_cutouts.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm (rejected hunks) -@@ -10,7 +10,7 @@ - // add an entry in change_appearance() if you add to here - var/list/possible_appearances = list("Assistant", "Clown", "Mime", - "Traitor", "Nuke Op", "Cultist", "Clockwork Cultist", -- "Revolutionary", "Wizard", "Shadowling", "Xenomorph", "Swarmer", -+ "Revolutionary", "Wizard", "Shadowling", "Xenomorph", "Xenomorph Maid", "Swarmer", - "Ash Walker", "Deathsquad Officer", "Ian", "Slaughter Demon", - "Laughter Demon", "Private Security Officer") - var/pushed_over = FALSE //If the cutout is pushed over and has to be righted