From 248586cfd70ea12f3be75693e6189f91cbc19546 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Wed, 13 Nov 2019 20:28:19 +0100 Subject: [PATCH 1/3] Unmodularize bikehorns and holy weapons. --- code/game/objects/items/clown_items.dm | 26 +++++++--- code/game/objects/items/holy_weapons.dm | 44 +++++++++++++++++ icons/obj/items_and_weapons.dmi | Bin 125797 -> 126782 bytes .../code/game/objects/items/holy_weapons.dm | 45 ------------------ .../code/game/objects/items/honk.dm | 17 ------- .../code/game/objects/items/vending_items.dm | 3 -- modular_citadel/icons/obj/honk.dmi | Bin 427 -> 0 bytes .../icons/obj/items_and_weapons.dmi | Bin 789 -> 557 bytes 8 files changed, 64 insertions(+), 71 deletions(-) delete mode 100644 modular_citadel/code/game/objects/items/holy_weapons.dm delete mode 100644 modular_citadel/code/game/objects/items/honk.dm delete mode 100755 modular_citadel/code/game/objects/items/vending_items.dm delete mode 100644 modular_citadel/icons/obj/honk.dmi diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index 1d302b409e..0997c78c29 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -111,13 +111,15 @@ throw_speed = 3 throw_range = 7 attack_verb = list("HONKED") + var/moodlet = "honk" //used to define which kind of moodlet is added to the honked target + var/honksound = 'sound/items/bikehorn.ogg' /obj/item/bikehorn/Initialize() . = ..() - AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50) + AddComponent(/datum/component/squeak, list(honksound=1), 50) /obj/item/bikehorn/attack(mob/living/carbon/M, mob/living/carbon/user) - SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "honk", /datum/mood_event/honk) + SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, moodlet, /datum/mood_event/honk) return ..() /obj/item/bikehorn/suicide_act(mob/user) @@ -130,10 +132,7 @@ name = "air horn" desc = "Damn son, where'd you find this?" icon_state = "air_horn" - -/obj/item/bikehorn/airhorn/Initialize() - . = ..() - AddComponent(/datum/component/squeak, list('sound/items/airhorn2.ogg'=1), 50) + honksound = 'sound/items/airhorn2.ogg' //golden bikehorn /obj/item/bikehorn/golden @@ -163,6 +162,21 @@ M.emote("flip") flip_cooldown = world.time + 7 +/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" + moodlet = "bshonk" + //canned laughter /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter name = "Canned Laughter" diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 84439985b2..8c48729393 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -755,3 +755,47 @@ righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' w_class = WEIGHT_CLASS_NORMAL 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 + 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.deity) + deity_name = GLOB.deity + +/obj/item/nullrod/rosary/attack(mob/living/M, mob/living/user) + if(user.a_intent = INTENT_HARM) + return ..() + + if(!user.mind || user.mind.assigned_role != "Chaplain") + to_chat(user, "You are not close enough with [deity_name] to use [src].") + return + + if(praying) + to_chat(user, "You are already using [src].") + return + + user.visible_message("[user] kneels[M == user ? null : " next to [M]"] and begins to utter a prayer to [deity_name].", \ + "You kneel[M == user ? null : " next to [M]"] and begin a prayer to [deity_name].") + + praying = TRUE + if(do_after(user, 20, target = M)) + M.reagents?.add_reagent("holywater", 5) + to_chat(M, "[user]'s prayer to [deity_name] has eased your pain!") + M.adjustToxLoss(-5, TRUE, TRUE) + M.adjustOxyLoss(-5) + M.adjustBruteLoss(-5) + M.adjustFireLoss(-5) + praying = FALSE + else + to_chat(user, "Your prayer to [deity_name] was interrupted.") + praying = FALSE diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index e41135b44610dc7f72c61760ead2654c3b5acced..26f000595887fcb0174a8bea15abfd09ebb2d398 100644 GIT binary patch delta 105235 zcmYg%byQT}`}Huiv>@F`NlSNkmvlEucMNw30coVWLy!;
F$tjkscW49Y5dS
zAMagr*UVjO?z-pf^PDI4v+vFvX7?Iq3K{+e76u3enqBM127$0@KQV(*0UY4bD#)il
zr8f{Imc9{u`fgUFg|lC+S>592bR0#(VujYm-*>?VDSCYVj!s^^ tq54k8TV!cLxtHttP+P
zafA8*JfUBs-WO$558uR5KE&_g$zhK;DmYlY{uBHWbvbkwh=_V>m&L|{ofGux6hQ(u
zC9_ajc!{;(V!#J2*6qrwUG5FgK+Udek5to~4&S(&3`2d|G#&Y}Z2WILq7^vyax9NZ
zHzt)s_jso@jZ>S0x^ NH#j5M4jnII$H>N=*_!qqzvC_LCjSh{4IwZdWps&OU@`;Gtl^PbkcG$(H66y;*
zL5x@o#ig;=bFUPcHe6F-n=$2_T#4>3ufK6P@=H_{fuN&~Ou=1+rFD474WsiC9%UoA
zJb^c)pfUN3=4o?H8VE757pwk5&*R`_CUXt4-RpxlLlPifu;^w)ePh|rvMK_9bd6oJ>6;w
z!YdNSl1A?zC{?RaawUdq!C?^sVJ(Tvfr04--6dO%4x)(x5=PvLJ$5X(nmOUw$%
zfvumxi1_=a_6ue>ACN
vcC}_Z==WTd6SNO4e6cF4;V7a
zQzHewtO1S5wio$=e9L*|{q
zTh0G<4+A%Yg+F1&R~T}V3F~>b+*p397wy4Q#u?yT_YGKcf6r1ah=_2$r*|Dg6!~M4g3NpWDvzZ0JUUe^
z%0M)zDTx4$Yz=&~0ls0QpxiPWWxhIj&jPMZkb}dSrvc0-A2m;8Uaqg@ZmIkV!3Y)b
zU~+DE#zH}Il+H4+#Uxja_e0s-{!zCf4djtr8Ma`*tgs>XF?WKL-90@;mFdOq?`75y
zkDsD;6p#A6@%)~!u@>o;=1y_z`QMD?o&mJZL2nfCB%D_8&!{|1h)gH@`=|sEw%es(
z*q6h6T@)C9qNy4YPA5c>^J^&`zz8p#p;je7u$sYzV2euN^?Np9cVf5Xm$O8y?Njhz
zxF6pEqt5xWaMbU2D;yTWoi5y1xPqwh=;DaL)MTFS9M$otm6y)AaPzIWMZ5>vGicOw
zwG|*tVqT)JMndadxaHhsWz}wky-|PY^L%G^f@2b#hE<(+gfPFCmF^SWu;%%?naOqv
zSD)czfQSVl`Nb^{_Dg-s=;7YxRh3vHInwpF^nan91t!>&;ISCtEmhZ@bl;lgwe|lr
z9XzwLZn3}Pp8xYD0Hn2qBHmo)?eEv+W%(!n$EXg~6H+OR=+Z^8;oClTb~R1SfEX54
z_D4w)&e@Ny&*RL;xPfm1t*zbHw?<$vn7psAq|aGSf;a{Wg_`J{+-$F&?%0*Qwy@)v
z1o_1YzY-c9`utS7;Pmyg8BJ9|kZmwH%4&RSqI@b8*f;3sL7?|4x9krTo9!jM?jOgn
zTzH+kC6gU2aw;|wKaSN
HmhnGkR*Bvcf{?tU`Z|n&4qqXQ!4N!@6(MDK(eY{-UL!;52IuO!I
z;gFOrZbJ?{mq2AtxOPT5mLQGP)RwBe@wjR-x;YUpRzvaH@b$rjpAs&7J>?d8!_yDG
zqtW#F6Snw7L{E=1Uo~B|5s$QN%v8L;JyUKGVzbYRrsTp2P*U~YX3jrE5J5C2k^^>k
zHy-fVke}Pn+vp>ZPQoc79x)cLgk*PnLS|ZTe+vdk>eP_-mc=bCLcZ5?d6Af~o~?x<
zAxKA=g#wK1^3n`*w8QNyQg43a25~$dC51>$AvT(08zp*kk|5#U4%~>T2nXL+&DLvc
zp=Z0CNTE%K2!-mKvb!#mU}6#2>hc!>c_NjPcUZeH^soB4U!J!kO)R;gfAV%dUj*+R
z!~h(VEbrDfHyk2J?lUpgAaRz8g^Yh+sIiK*oc#?8Oy@Qg>-F&(f=o|tIl;s#?P>B
zDEUMAAOFDA!_agf7+`e8!sK*vV@roJ(#GlS&91JswJKh4zGylOB
CXq0T_R1jp!aQjBm}t^uYx5O+XwHt(Z!6=^zuRR5#e
zq$~Oc&Vmy+F3G8By(OQ0pIDwD3*;d&8}H9n9BLK`?G;
z;W`f$4DX=hXiiRGsQOJ!ylQQ0VPM$5J6Lwoe>ZV3<@TTwUzfPU$*R<&4{?4#A7?s)
zM2m4z92i{HUtiQy{uC?wtKlBX8kq^t`a4iL^B^wqs}b+pORP!?`ELqe)QVhXVKtDz
z^}uwGg%12{p&LJyd$vrEYmHrbzu;IJHy085QoO;|Bon`L(l=nh42oNN
zX=