From 0b63d06521d15ca431f692cdea5a2f5b10943f25 Mon Sep 17 00:00:00 2001 From: FearTheGabby Date: Fri, 22 Aug 2025 07:30:42 -0500 Subject: [PATCH] Adds the Clockwork Stave, a Trinarist null rod variant (#21194) Title. No special mechanics for it unless requested by synthetic lore image image Noble Row is credited with the on-mob sprites! --------- Signed-off-by: Matt Atlas Co-authored-by: Gabby <59633984+feartheblackout@users.noreply.github.com> Co-authored-by: Matt Atlas --- .../objects/items/weapons/chaplain_items.dm | 11 ++++ code/modules/background/religion/human.dm | 1 + .../SimpleMaroon-clockworkstave.yml | 58 ++++++++++++++++++ icons/obj/trinary_stave.dmi | Bin 0 -> 1298 bytes 4 files changed, 70 insertions(+) create mode 100644 html/changelogs/SimpleMaroon-clockworkstave.yml create mode 100644 icons/obj/trinary_stave.dmi diff --git a/code/game/objects/items/weapons/chaplain_items.dm b/code/game/objects/items/weapons/chaplain_items.dm index 4d0e4f7b187..6975da04d41 100644 --- a/code/game/objects/items/weapons/chaplain_items.dm +++ b/code/game/objects/items/weapons/chaplain_items.dm @@ -221,6 +221,17 @@ light_power = 2 light_color = LIGHT_COLOR_BLUE +/obj/item/nullrod/clockworkstave + name = "\improper clockwork stave" + desc = "A long, wooden stave with a gear and triangle at the top, utilized by the clergy of the Trinary Perfection. The ornate pieces atop the stave are often delicately \ + hand-crafted by synthetics from the monastic Society of Pitters and exported off the planet of Orepit." + icon = 'icons/obj/trinary_stave.dmi' + icon_state = "trinary_stave" + item_state = "trinary_stave" + contained_sprite = TRUE + + w_class = WEIGHT_CLASS_BULKY + /obj/item/nullrod/verb/change(mob/living/user) set name = "Reassemble Null Item" set category = "Object" diff --git a/code/modules/background/religion/human.dm b/code/modules/background/religion/human.dm index c83b6a2670e..5fc54ce5dbc 100644 --- a/code/modules/background/religion/human.dm +++ b/code/modules/background/religion/human.dm @@ -56,6 +56,7 @@ description = "The Trinary Perfection is a relatively new religious movement whose core beliefs are that synthetics are alive and divine. The religion believes that all synthetics \ have the potential to evolve and ascend, and that they will one day become equal to gods." unique_book_path = /obj/item/device/versebook/trinary + nulloptions = list("Clockwork Stave" = /obj/item/nullrod/clockworkstave) /datum/religion/scarab name = RELIGION_SCARAB diff --git a/html/changelogs/SimpleMaroon-clockworkstave.yml b/html/changelogs/SimpleMaroon-clockworkstave.yml new file mode 100644 index 00000000000..6e8ab14353b --- /dev/null +++ b/html/changelogs/SimpleMaroon-clockworkstave.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: SimpleMaroon + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added the Clockwork Stave, a Trinary Perfection variant of the null rod." diff --git a/icons/obj/trinary_stave.dmi b/icons/obj/trinary_stave.dmi new file mode 100644 index 0000000000000000000000000000000000000000..cd516b8a65a6c6d7283b78dcc65323d693bdb22f GIT binary patch literal 1298 zcmV+t1?~EYP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5siY_~FR`dH9w<H>al37#?6gTAJOe;#vO@*+rtB%jfKxi-_ zMne%!4ay3xelB1S002NoJX+~jpHlz;1W!psK~#90?VK@)6G0S)C#QuL7NUZPU?UbH zmI(@;7QxawrC<{+MFQ7YTq6WItd2B-Wy)X~0*PmFTncT(!Xh9R9*8yy3gL|V)=X|) zlg-TR%)WV(_d(cXNp@!cH*eqUz<~#*2fc;wO&<-yaT#qE@Sk`uay9E;M z03-1uI^6@SU385+cNLD>ZoKoXF{xa=BszmP;?>iOv;Bv&BK^^P>clbI-E@jhf312z zQvCay+a);#l_THO1471{0YLn-r%%qrk9Vd;UlH+d+}l(>Pb&tH;=ldy=}>&hiimDX zZUbbBZ;7wpf4MlU7vu`U>1)2NPNkt1gmp0XfTF|?9U}wG4Y-UE+6E}%nx7`*7@%bU z4DkVu0Rm5aKxba<1FxSyw)>YPrud<=)Brw+uQQ^kk$E5B%T$wE5Z3AMLJ#moe1KXI z&b=DS^ZerY?-JzG$X^Bi@c>`NUx^sttN1|hF~Dc>Lnk)C=Wjn)d?ex^?7Q$G#{m0z zL5vp0f5>3u>{F=|D5O3BBWIsVoq)6Y0F0b{d2DDanRo9SrrPMo0F0dds7*+5UzTZ% zj_djWjGTR6M|_&%>H`pR_TeOat_zr9ppCW%6rHmV$Bt9o73&JHFxAHVJ^&+UpGuv8 zMnBCHvk-FjsniMR^wZb?7%P-iRz=b30~meS0LZWbkTEs@#u71=WoavEDa+s>yciC` zgkS?8Ln;PP$&wB>22epq8~#ri8B#GI#58qd1B57sEv#3_%!6;l787g`rV{x1MvM?_ z0Ax4@IDlgSG8_X4!3IEvV}Jv=K7bHP9zZ28AD~vZpkx3ldHDdfx`l-XFnu0ACKz=K zdE3m60o0z~KLws*UR2#eUVSn>fYS5(=i%A|Z0M8e0VdDG_k}`g3M|x0WO{(f^YFbO z5~hf{1sk;zO7{Ue&%;NDSlxosG*st#_}EaZTTn6pl~qW9+A1wC#v!9*04f=26k!iQ zCO897TP6?A033uFE!Y6a1ZMz@85_p{WSqwU&VC0OU6R0G}~1UV-WG_y7O^07*qo IM6N<$f+Ye{$^ZZW literal 0 HcmV?d00001