From cef72b93eb58a183c5a029f3bcb0a434c8bf9b44 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Wed, 13 Nov 2019 20:35:21 +0100 Subject: [PATCH] The files. --- code/game/objects/items/clown_items.dm | 2 -- code/game/objects/items/holy_weapons.dm | 4 ++-- tgstation.dme | 3 --- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index 0997c78c29..d86354f195 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -166,14 +166,12 @@ name = "silver bike horn" desc = "A shiny bike horn handcrafted in the artisan workshops of Mars, with superior kevlar-reinforced rubber bulb attached to a polished plasteel reed horn." attack_verb = list("elegantly HONKED") - icon = 'modular_citadel/icons/obj/honk.dmi' icon_state = "silverhorn" /obj/item/bikehorn/bluespacehonker name = "bluespace bike horn" desc = "A normal bike horn colored blue and has bluespace dust held in to reed horn allowing for silly honks through space and time, into your in childhood." attack_verb = list("HONKED in bluespace", "HONKED", "quantumly HONKED") - icon = 'modular_citadel/icons/obj/honk.dmi' icon_state = "bluespacehonker" moodlet = "bshonk" diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 8c48729393..f78f6db3f3 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -757,13 +757,13 @@ attack_verb = list("bashes", "smacks", "whacks") /obj/item/nullrod/rosary - icon = 'modular_citadel/icons/obj/items_and_weapons.dmi' icon_state = "rosary" item_state = null name = "prayer beads" desc = "A set of prayer beads used by many of the more traditional religions in space" - force = 2 + force = 4 throwforce = 0 + attack_verb = list("whipped", "repented", "lashed", "flagellated") var/praying = FALSE var/deity_name = "Coderbus" //This is the default, hopefully won't actually appear if the religion subsystem is running properly diff --git a/tgstation.dme b/tgstation.dme index 9e52889df7..c202ef197e 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -3009,10 +3009,7 @@ #include "modular_citadel\code\game\objects\effects\temporary_visuals\projectiles\tracer.dm" #include "modular_citadel\code\game\objects\items\balls.dm" #include "modular_citadel\code\game\objects\items\boombox.dm" -#include "modular_citadel\code\game\objects\items\holy_weapons.dm" -#include "modular_citadel\code\game\objects\items\honk.dm" #include "modular_citadel\code\game\objects\items\stunsword.dm" -#include "modular_citadel\code\game\objects\items\vending_items.dm" #include "modular_citadel\code\game\objects\items\circuitboards\machine_circuitboards.dm" #include "modular_citadel\code\game\objects\items\devices\radio\encryptionkey.dm" #include "modular_citadel\code\game\objects\items\devices\radio\headset.dm"