From f882fc0762fa8d042e7022f3c579a2cf8e71a120 Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Wed, 10 Jun 2020 14:03:13 +0800 Subject: [PATCH] Fixes bodybag examine text (#9066) It was incorrectly using closet examine code and it incorrectly kept displaying it as empty. This should resolve that issue. Also tides up code here and there and some cleanup. PR'd again, in an attempt to stop travis cloning itself. Also makes a proc out of the examine to make things cleaner I guess --- code/game/objects/items/bodybag.dm | 46 ++++++++++++------ .../structures/crates_lockers/closets.dm | 23 +++++---- html/changelogs/wezzy_bodybag_fixes.yml | 41 ++++++++++++++++ icons/obj/bodybag.dmi | Bin 4007 -> 778 bytes 4 files changed, 84 insertions(+), 26 deletions(-) create mode 100644 html/changelogs/wezzy_bodybag_fixes.yml diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index e2fad0595e0..eb09ae79abf 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -6,12 +6,14 @@ icon = 'icons/obj/bodybag.dmi' icon_state = "bodybag_folded" w_class = 2.0 + drop_sound = 'sound/items/drop/cloth.ogg' + pickup_sound = 'sound/items/pickup/cloth.ogg' - attack_self(mob/user) - var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc) - R.add_fingerprint(user) - qdel(src) - +/obj/item/bodybag/attack_self(mob/user) + var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc) + R.add_fingerprint(user) + playsound(src, 'sound/items/drop/cloth.ogg', 30) + qdel(src) /obj/item/storage/box/bodybags name = "body bags" @@ -27,7 +29,6 @@ new /obj/item/bodybag(src) new /obj/item/bodybag(src) - /obj/structure/closet/body_bag name = "body bag" desc = "A plastic bag designed for the storage and transportation of cadavers." @@ -37,11 +38,24 @@ icon_opened = "bodybag_open" open_sound = 'sound/items/zip.ogg' close_sound = 'sound/items/zip.ogg' - var/item_path = /obj/item/bodybag density = 0 storage_capacity = 30 + var/item_path = /obj/item/bodybag var/contains_body = 0 +/obj/structure/closet/body_bag/content_info(mob/user, content_size) + if(!content_size && !contains_body) + to_chat(user, "\The [src] is empty.") + else if(storage_capacity > content_size*4) + to_chat(user, "\The [src] is barely filled.") + else if(storage_capacity > content_size*2) + to_chat(user, "\The [src] is less than half full.") + else if(storage_capacity > content_size) + to_chat(user, "\The [src] still has some free space.") + else + to_chat(user, "\The [src] is full.") + to_chat(user, "It [contains_body ? "contains" : "does not contain"] a body.") + /obj/structure/closet/body_bag/attackby(var/obj/item/W, mob/user as mob) if (W.ispen()) var/t = input(user, "What would you like the label to be?", text("[]", src.name), null) as text @@ -53,13 +67,15 @@ if (t) src.name = "body bag - " src.name += t + playsound(src, pick('sound/bureaucracy/pen1.ogg','sound/bureaucracy/pen2.ogg'), 20) add_overlay("bodybag_label") else src.name = "body bag" //..() //Doesn't need to run the parent. Since when can fucking bodybags be welded shut? -Agouri return else if(W.iswirecutter()) - to_chat(user, "You cut the tag off the bodybag") + to_chat(user, "You cut the tag off the bodybag.") + playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) src.name = "body bag" cut_overlays() return @@ -80,7 +96,7 @@ if(!ishuman(usr)) return if(opened) return 0 if(contents.len) return 0 - visible_message("[usr] folds up the [src.name]") + playsound(src, 'sound/items/pickup/cloth.ogg', 15) new item_path(get_turf(src)) spawn(0) qdel(src) @@ -95,9 +111,8 @@ else icon_state = icon_closed - /obj/item/bodybag/cryobag - name = "stasis bag" + name = "cryogenic stasis bag" desc = "A folded, non-reusable bag designed to prevent additional damage to an occupant at the cost of genetic damage." icon = 'icons/obj/cryobag.dmi' icon_state = "bodybag_folded" @@ -105,12 +120,11 @@ /obj/item/bodybag/cryobag/attack_self(mob/user) var/obj/structure/closet/body_bag/cryobag/R = new /obj/structure/closet/body_bag/cryobag(user.loc) R.add_fingerprint(user) + playsound(src, 'sound/items/drop/cloth.ogg', 30) qdel(src) - - /obj/structure/closet/body_bag/cryobag - name = "stasis bag" + name = "cryogenic stasis bag" desc = "A non-reusable plastic bag designed to prevent additional damage to an occupant at the cost of genetic damage." icon = 'icons/obj/cryobag.dmi' item_path = /obj/item/bodybag/cryobag @@ -125,11 +139,11 @@ O.name = "used stasis bag" O.icon = src.icon O.icon_state = "bodybag_used" - O.desc = "Pretty useless now.." + O.desc = "Pretty useless now." qdel(src) /obj/structure/closet/body_bag/cryobag/MouseDrop(over_object, src_location, over_location) if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src)))) if(!ishuman(usr)) return - to_chat(usr, "You can't fold that up anymore..") + to_chat(usr, SPAN_WARNING("You can't fold that up anymore.")) ..() diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index da238d9e635..40448842192 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -51,22 +51,25 @@ // Fill lockers with this. /obj/structure/closet/proc/fill() +/obj/structure/closet/proc/content_info(mob/user, content_size) + if(!content_size) + to_chat(user, "\The [src] is empty.") + else if(storage_capacity > content_size*4) + to_chat(user, "\The [src] is barely filled.") + else if(storage_capacity > content_size*2) + to_chat(user, "\The [src] is less than half full.") + else if(storage_capacity > content_size) + to_chat(user, "\The [src] still has some free space.") + else + to_chat(user, "\The [src] is full.") + /obj/structure/closet/examine(mob/user) if(..(user, 1) && !opened) var/content_size = 0 for(var/obj/item/I in contents) if(!I.anchored) content_size += Ceiling(I.w_class/2) - if(!content_size) - to_chat(user, "It is empty.") - else if(storage_capacity > content_size*4) - to_chat(user, "It is barely filled.") - else if(storage_capacity > content_size*2) - to_chat(user, "It is less than half full.") - else if(storage_capacity > content_size) - to_chat(user, "There is still some free space.") - else - to_chat(user, "It is full.") + content_info(user, content_size) /obj/structure/closet/proc/stored_weight() var/content_size = 0 diff --git a/html/changelogs/wezzy_bodybag_fixes.yml b/html/changelogs/wezzy_bodybag_fixes.yml new file mode 100644 index 00000000000..546f524e691 --- /dev/null +++ b/html/changelogs/wezzy_bodybag_fixes.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixed bodybag examine text." diff --git a/icons/obj/bodybag.dmi b/icons/obj/bodybag.dmi index a1f990312809ec446985c852e3ff8267b223bef2..f693b9ffb3d6f79840b7e193246bdc80e706fc35 100644 GIT binary patch delta 767 zcmV0d!JMQvg8b*k%9#0FHW8Sad{XbAMxUX>fFDZ*Bkpc$`yK zaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+ zDL`qSdG6=cJI} zmYl?-)Er!@m46jn{anBy0|1>hRom@nuXX?c0nJH7K~z|U?N-~8!XOMSSBvh}IIdOq z|37pSE-kdUyDB(7aAx|_kaH3e0$tb8(9rN!U;+QLbI$Ma$Nxe)h}??A&WK(q#ht~k zkWyPnwsMWU*9sZCU_`IfhFe}6G_FAM9-(#WAG^8`w10@w%-L=D8w3ep$dr_jL13Z4 zR_+8fZRXmJ^hCZfhPH^&rpybZBn1%_gXQ?0k78>(mez73wp%CA>lBoN%}34=>NSD_ zOJe7N8)0k;%xz2WH^=T0xs#3z5oY+E1olZ}=M(piV5|buu|glJ;L0ss^_Bkk%waG) z-nr@x7=JvUxgC2Dz*q*0{Q_nOzD@Q+ZiO+7JG%F8ZwQhX>Q;@ejh|r z)0gkol~wmfYiMYA5vHREmH4M=R!MW2x{mkO{5vB zC@o5nCIpRAq)Uf){R7@xZ>@9hxj)REnX}KFz0V|DSzf=$c!?1N0$nsUF|+}^`@aWF z2fUZ^BUAxb7HQ`cYUusYGX(x16drUR1VZ47GxZoh$U%%I2cZ%zOabkLdjFe01g@ttvrzU2>$Fv~VAFm9xr&KrEf6hI)1g+RBY2 z5pRJn>`5F4+Z7sG3g&JgC%K_1GqiS+rsa~8sV$gP&V%?b-Fjv=qE=adN=+gj_^Q%6 z+G|_4#6BHhAAKc=2kSlIS?kGIN3_fS{WCl~MAE6Ev`)`W&)w?x!44r`WH0Tlos>}a zqvwAXY^ctTjzTnN<0INY%^D@3t7L}n3jdeGlQ^OxBTZT#($Uei@LnF??pdh!q(A! z-Q6r*K@bRHbgW#ts&4bzu6K`u!C+DdE;ZwaG7bslX{;d3UERq&T#qd?QCB?YuCP;1 zky-iFqqi(tT3QLY#6o1r2w%Gei54Wvo}98WqNJ>hHM{Iw#R+1%BGW0B`@y-p{INi~ zG1YQYq%*%+2WasDPnZ5>x{#=x#(;8K5SIiR+!g%8+#aWYxrRUp9BR5eWz*9vJ};Ms zenDFHdNYmRiIq$l4Quy%6zb~hEoYI#AU>oJd%^k!DM1iy6cvU#<*P;GL>E%~LJKCY5 z5Toqqo6ufrHpY(DDKBmjojAJ$4^v5%PooK>7c*i-sS>)!;E zvXc#Qi7!Y*1{xZg+rrrczx4w>BJgR{K< zn+{N>d<);A669h2_BR%}ZB+O7s)Vpp-g5_0(*~^=smR#Ii0P{a>(Y^BzuvKwP^Qhi zQK*vB;rr7PLkhy#Cd0m=ECZeQwG~aDrs%B}3zYFxz;oXV)ZNJuHf1k*2`XwATy>6+ z8n_9uK-D)QULRzeBvkKHby0SvOI-Y08KxGPR0Bg5fA{_buTtJ#-Tf9i=04X@SN+=c z0+&dN>$bi9l{O&<>5fLnIA_ktyJ+o{0!O#En~uJ#0{l~k4YKqp6&#~ijE>voRw_EYogDxYO?CLGwM zc|_^GO*}$suT9m*Pwi2E)2|*)e|OTNIl?Vkl4A1k`-`)st}f6diDa-%L(>}}vX0@> zgK#zSzJqQ_O&k{-9zGIBH~P*rel!%$w&h>lz}@G%Dt;Kduh|u>hSO%P>x)w3!Fx5SW)?7Q6*ZxLd*?uBKCzOqiTkMCjWKeY>*J`O|3oXx0xAp z@#XK`@d=bi;d7zt7fVNya&x(Us(n?wn1WwMXsKlwxVrLHynHES%HDCZZ9dSD7EjNL z4NzvfmHT{EJ%dlf!O#3PRDw%egULgx1a$;&2w!)mrKU2$(&|C72E7DL+4Y}82m}J~ z(J(FZum>n5eee#m^(1hZHV=`Hjmu2La}Gvg?qtTOZc}NW?%KX>ZsxvX5ELW}hr{FG zg*O67ifoLD&sNn_-CSJ*dEH2ghQe$>NLO5%1TUrQPlf@@y&%DnJD*h$f2Vy1lQ|?9 z({EV@`!8Ph)%)}kKo-?002lyP1svbeQPRqH>C&ZV1Zg08d3AM0_iit-AqB7yP>>Px zk0dZjN%c|t_d`QNzkjN{=`nQElKdgjcs6RI9r3fkHzl{cxjFA`V`KelK}E8zpjGh6 z*qAi{OQmD2FqDzXiKp-srQ_`4!Um?Ti#bPaf4p1^Z5GcZ4w?-lUl;@U#z^rJKshjf zfB!7Aaw|v2q?HwapM5zC4j_%AVSEV?$rN;QGQ+HEPOn6#cIx^_VDH8VPH*Hl$?x7h zVrR*T+idjyoKwBW1&3;9`=<9mWUG_4{ZmssqNeByxHs7xn*fxB2{vIUPxhLgL(Of5 z404v`%f+`WW5;vCyB}#jSWINN6 zHXMWhepacEJ`TsJ22;mOJn3t^soh|*T)I)Atc$bD;NgokZMMJ%_=yF2n-59TZppfmz4B5x$`)=~2>k&pT)u?w#?jC}#!Ci#uy{#oA!le<+1k=rkeu>f&PNjEoV@${`{gw> zm@G(LJDOl2#N7qArLQy_OSp>Xjg6c|Dnaw(U%!S;m?Dq4L~;h*kw{#!^0jO6Axg?lr}gO867 zNM@ENBP|V@Zjr>ALH-B67Qn+m{Q|%nj`Md1!+=3R`lB*qJ3#upKqnSZDa@5B#FhFZ zU<~o|HWMEoUxMWmtZ04p6MB9GsOv+5Sx|?fg{O-!tiOH{3qe1m4AO>%r~72FXIKS|kB?tIIox^N>#;T_5bcL2NCTWNr=pVNF88>jqr;_- z6KM{v^Bv)5Pd2OzCL90#C0lRmTFt@qYf5b^b=e> zz-Hw(EgK!jRxU0~?%fe9`^Rjly>jyMaVDZ@fa8$I>&-wL`fGLdVQbH@)C^7TjKD?$ z215s=aB$G{0W1lSJ&z=Pp&oLuLsND(Ta`=mA7cYl5EQ%_eN5)#w1I9Nt=5uH7fyIf z&Zad~!&ac`8X8+VG&;SN^z*%Er!ncob0v&H)H${5`9YDA2I zp3>5dOo@c9mCOiq@nCVMezMbV zTZ=L`PxXw^3}XSKLHb}oTmh}v?B#ZgJt7y^g{?X?JlgS5R8*8Jx-Q4_>CpU7Va45$ z5cVSFK>e5)ook)*Yjr{cS7P3CIMm+x{4?K5(r(l7>+7#Kv7$&o{+!yv*VBLgh>EX9 z&u;f?EVgZQ&-d2!orNd;+u2#T1jTadV$8|9rD@dB{$gh5+}1qng94YO eM_r`~=d7gM`4Fqo#xKCl8)Rx^X;`E0j{YC})t$Wn