From 7a13c8136fbaf010e9193aede4303ea69b628de8 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Wed, 27 Sep 2017 18:59:26 -0500 Subject: [PATCH] Finishing touches on gravemarkers --- .../items/weapons/material/gravemarker.dm | 13 +++++++++---- code/game/objects/structures/gravemarker.dm | 9 +++------ icons/obj/structures.dmi | Bin 91318 -> 91484 bytes icons/obj/weapons.dmi | Bin 35869 -> 35942 bytes 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/code/game/objects/items/weapons/material/gravemarker.dm b/code/game/objects/items/weapons/material/gravemarker.dm index cd5d3c6079..f50416b05d 100644 --- a/code/game/objects/items/weapons/material/gravemarker.dm +++ b/code/game/objects/items/weapons/material/gravemarker.dm @@ -7,7 +7,7 @@ force_divisor = 0.65 thrown_force_divisor = 0.25 - var/icon_changes = 0 //Does the sprite change when you put words on it? + var/icon_changes = 1 //Does the sprite change when you put words on it? var/grave_name = "" //Name of the intended occupant var/epitaph = "" //A quick little blurb @@ -15,19 +15,24 @@ if(istype(W, /obj/item/weapon/screwdriver)) var/carving_1 = sanitizeSafe(input(user, "Who is \the [src.name] for?", "Gravestone Naming", null) as text, MAX_NAME_LEN) if(carving_1) - user.visible_message() + user.visible_message("[user] starts carving \the [src.name].", "You start carving \the [src.name].") if(do_after(user, material.hardness * W.toolspeed)) user.visible_message("[user] carves something into \the [src.name].", "You carve your message into \the [src.name].") grave_name += carving_1 update_icon() var/carving_2 = sanitizeSafe(input(user, "What message should \the [src.name] have?", "Epitaph Carving", null) as text, MAX_NAME_LEN) if(carving_2) - user.visible_message() + user.visible_message("[user] starts carving \the [src.name].", "You start carving \the [src.name].") if(do_after(user, material.hardness * W.toolspeed)) user.visible_message("[user] carves something into \the [src.name].", "You carve your message into \the [src.name].") epitaph += carving_2 update_icon() - + if(istype(W, /obj/item/weapon/wrench)) + user.visible_message("[user] starts carving \the [src.name].", "You start carving \the [src.name].") + if(do_after(user, material.hardness * W.toolspeed)) + material.place_dismantled_product(get_turf(src)) + user.visible_message("[user] dismantles down \the [src.name].", "You dismantle \the [src.name].") + qdel(src) ..() /obj/item/weapon/material/gravemarker/examine(mob/user) diff --git a/code/game/objects/structures/gravemarker.dm b/code/game/objects/structures/gravemarker.dm index 0be42fcddb..a10cd0bf6e 100644 --- a/code/game/objects/structures/gravemarker.dm +++ b/code/game/objects/structures/gravemarker.dm @@ -8,6 +8,8 @@ throwpass = 1 climbable = 1 + layer = 3.1 //Above dirt piles + //Maybe make these calculate based on material? var/health = 100 @@ -132,9 +134,4 @@ return src.set_dir(turn(src.dir, 90)) - return - -/obj/structure/gravemarker/gravestone - name = "gravestone" - desc = "A large stone used in marking graves." - icon_state = "gravestone" \ No newline at end of file + return \ No newline at end of file diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi index f6779fed715128a413c042b8f959431c93ee8ff5..3b4604cdfd50ebacecdc37adb0dc5b89710ab0e1 100644 GIT binary patch delta 12648 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 L7pt%g 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
Cfu-+OZgF4G8|}V zcUUZ(jPosqMqHgb_$BO51a(?gVVHY+z% zB&=fzltxb^i;acG*@Kz=4i$={$tDwB!VAm!7RvlKx2crKF>U2D^hcYv0x+d@H4zC} zd8%qH+2yQ5Jq3MbAL84kDAWTsHB{P)FJ5MA`^pvvRmv6`B5M>bB}hS|e`h~@Hb(}< zl;V)-%T@=OqC@LyWR_FJvj>Dy8K% z_e1E)7Hc?H#k)~{=J-T~Y%>qqNl^{sP|7_5MyA5^8t^zkpDq7QB}}L3h+k)LrS7@{ z55XpP6e^ndGcXx)BC8wLts)a_H+(&G@@*rrh@}Eeae{n(@y78+Ib?qlC796AQ_KKp zbVPjrJ{^fFCLr3JLUPeh@I}z!1ojb;=eWV0flT!@VfaiA6cb<0WW=M5PXN78XGZ(2b7 zF*l4sY|<3SGZw$FGkI{~_2IRWCX$>TKHF}knu*`0rFtz&*)+ds*Mkx3UiJ>7>7UON zaU4?x(XJzZ?Y2RURLU)rE9t-|#*VaolUI{B#n&;p56Us1qhg61m)}E~eH#c&7J4qF zOdy*tQ0=#>Ppr$Xca?ZQ`M80<0WYvY9Rr`Fq{KO1PZ@uoEo-a{>r6{awAUF(Vf}aj z{Sb_By68Q^y$VV_U8rUs$tWQ^5L#eP`==WTX%2#OP;blF%$4Kb${a7tkivN9G~en6 z`_0qIvs$&&q_AurIvx4Zm5FhPCuOk2&^7{U^q`so4|Xq*89!yueZ6jR5?^W zJD$iS2CG8G*>`QzE*$X9%yW;fg}C(U>gg5<=~y2xgV%GSMFbcl;{S<81F&rGI^Z3P zQDH8mCrCblueyziL~{(F@a!<{zr#pKK9Py&P~zRpYY0F;SVAK#Y%n%Bh|qc9s%l_h zCn6U~sqh?a_b;VJy!zpbw>^jDdxeO^ni}E%-#-yZ=OS9JIhv8E!Ty(MbAqw0za{_v zcSM-OId)wISX=Bln%Qqe>;EMO4&8V2ITSv$x`24+^RcVI(BL4O;p6fbKG2u9Tqd&$ zOeaxAuq@HrtlnAJB>CfK(?i$;c?&!lmHDe5q)|i3!qE)E!fjfL z*ql|hy!p@po_|SETCisc;V2v`@|*hLclLp^MBzdihSTDA}t?AAURB-0jT?s z+sp>uPF=mih`M@=SCBfd&v-mts4~;uUWZbjy za(z9%$C3K})yw8pU#;p1$L{|;;Xk~ta9+L~m4A4Djv_8snT1S>=EC(w50t@#LfMvj zr^ueq_z@6N#0KhV@taOA?( zk7Ec~{Ha9jce7`$W?+I4j&xVo|7^Qu?&13OgG(RfAXMbtE=oS|Dz1i2^^#cO*@*vt zMJq=RzOoUE0;*|)$*zn2iI%Cr%oqj2>%o8J=0EbYKadt?W!1FVMDg8WIHO{BjOXEh z;fK%7Y;P*Fc8Y1?8DStkD@C9D|4C&unZiq3E20GPQp+d6*5rRsf`im+?)a|CtyAI0 z+y7qL_nx1nK@O(>4vx5{L#$k#8uMe*|L=c|#US5r|Hy{rSX@>3|CKG+R6ueNw`i?? s9irv`+`yR~{$hQjh@9;I4oDybcA#O>)?#P!2?0Ljq?9Df#f=014{G9A@c;k- diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index b371d13c0a0f2c79b9eebdc4305ff8cbb645a03e..01d769a0f46d3718b1aaabf31a83e2424b4db7dd 100644 GIT binary patch delta 489 zcmVGA8BkZ{H*3rXFg?c59^g6!Lg{NsAhhZ`yV75~ zcCF#}?%lgp*Ee2ft^V%ayF0aC&Hg*8PY{HApjrveTJz}&OMy(zAh&kyS}a?(%)I(x<+x~u-~ z-MbCJA80cIXV#~C!4ZV}B8ve@%}0(h8zV9@QZ!y>X%L)Ye70@x;5X?juTKU<5ble^ z2Behvn1cmHQ?sl9`-3g%^U)`N10o3b#i29`4|U8(sylrf*@Q2n=>HZ=0gw!LAVAsWkAn7^Ngq;KOR5l z=AyK;w8M-yf*=Tjum#WLNM?^@zh)A5fKrA;^Jb|)YNb_A5+(%sClawlOc=B2JL}# f1Yr-8@rxJ~SHA;KaI?>A00000NkvXXu0mjfGA&jaeJ{AP{$0Dw-X6V0uY20mNX0YFAZhE)NO z^wra+3sDKeeNn9hXRY~kg{1(e#^5;V^VKH^!gWxz1ecVQWH^(y#eBLtlePz2#wbXi zuRcK#?tyFuv@0!5%r7Xg+jOL~j}>$phXCv=0ogkKK>B?334(ABWElfu=2KjMTx_@L zm?APVveQ_Er9p6p@!7V$!H@Kn*QYTcf^c6PHXxZ%rno3`tjrOb8aq5OG{B)T&z^P2!bF87soR>Iav%2 z4h8_MTD8h-Hlz9RRS^L43knS8^TiimQ1(L*1VPwEkBu8Q3KbOD8Bs#UAZ-h$<+ zx6UIXA_B$5#i*&N;c7mnt~F8fDtyxCt4|PwYtRD#Hg4P~9655ttO-4ne~Yy;<#|8^ xVK4MJ27+*3x@8HDAP9o!{*VC?1VIp7`2PwJyM0e6p3DFM002ovPDHLkV1nKw%OC&%