From fa940c8a07216fea3e83d6aaa1ae55ac1e982b61 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 7 Apr 2022 16:48:47 +0200 Subject: [PATCH] [MIRROR] Removes the clown borg lollipop snowflake [MDB IGNORE] (#12560) * Removes the clown borg lollipop snowflake (#65960) I have no fucking idea why this even exists, there is no difference between regular borg lollipops and this one. I hate feature coders * Removes the clown borg lollipop snowflake Co-authored-by: Seth Scherer --- code/game/objects/items/robot/robot_items.dm | 2 -- code/modules/mob/living/silicon/robot/robot_model.dm | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 3c56b745fe1..078aedc48cb 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -356,8 +356,6 @@ var/firedelay = 0 var/hitspeed = 2 -/obj/item/borg/lollipop/clown - /obj/item/borg/lollipop/equipped() . = ..() check_amount() diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index beacd849d9b..741a3344515 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -310,7 +310,7 @@ /obj/item/lipstick/purple, /obj/item/reagent_containers/spray/waterflower/cyborg, /obj/item/borg/cyborghug/peacekeeper, - /obj/item/borg/lollipop/clown, + /obj/item/borg/lollipop, /obj/item/picket_sign/cyborg, /obj/item/reagent_containers/borghypo/clown, /obj/item/extinguisher/mini)