Unmodularize bikehorns and holy weapons.

2019-11-13 20:28:19 +01:00
parent c4849ead74
commit 248586cfd7
8 changed files with 64 additions and 71 deletions
@@ -1,45 +0,0 @@
-/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 = 0
-	throwforce = 0
-	var/praying = FALSE
-	var/deity_name = "Coderbus" //This is the default, hopefully won't actually appear if the religion subsystem is running properly
-
-/obj/item/nullrod/rosary/Initialize()
-	.=..()
-	if(GLOB.religion)
-		deity_name = GLOB.deity
-
-/obj/item/nullrod/rosary/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
-	if(!istype(M))
-		return ..()
-
-	if(!user.mind || user.mind.assigned_role != "Chaplain")
-		to_chat(user, "<span class='notice'>You are not close enough with [deity_name] to use [src].</span>")
-		return
-
-	if(praying)
-		to_chat(user, "<span class='notice'>You are already using [src].</span>")
-		return
-
-	user.visible_message("<span class='info'>[user] kneels[M == user ? null : " next to [M]"] and begins to utter a prayer to [deity_name].</span>", \
-		"<span class='info'>You kneel[M == user ? null : " next to [M]"] and begin a prayer to [deity_name].</span>")
-
-	praying = TRUE
-	if(do_after(user, 20, target = M))
-		if(istype(M, /mob/living/carbon/human)) // This probably should not work on catpeople. They're unholy abominations.
-			var/mob/living/carbon/human/target = M
-			M.reagents.add_reagent("holywater", 5)
-			to_chat(target, "<span class='notice'>[user]'s prayer to [deity_name] has eased your pain!</span>")
-			target.adjustToxLoss(-5, TRUE, TRUE)
-			target.adjustOxyLoss(-5)
-			target.adjustBruteLoss(-5)
-			target.adjustFireLoss(-5)
-			praying = FALSE
-	else
-		to_chat(user, "<span class='notice'>Your prayer to [deity_name] was interrupted.</span>")
-		praying = FALSE
@@ -1,17 +0,0 @@
-/obj/item/bikehorn/silver
-	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"
-
-/obj/item/bikehorn/bluespacehonker/attack(mob/living/carbon/M, mob/living/carbon/user)
-	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "bshonk", /datum/mood_event/bshonk)
-	return ..()
@@ -1,3 +0,0 @@
-/obj/item/vending_refill/medical
-	machine_name = "NanoMed"
-	icon_state = "refill_medical"