From 17ed03e1c8fbf4bed31d544d9e85f6945dc72612 Mon Sep 17 00:00:00 2001 From: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com> Date: Wed, 19 Oct 2022 18:52:52 -0400 Subject: [PATCH] Updates forge structure sprites (#16957) * alright * a few little tweaks * fixes ashie ice den compile errors * contrasts them a bit more --- ...icemoon_underground_ash_walker1_skyrat.dmm | 12 ++----- .../modules/reagent_forging/code/anvil.dm | 7 +--- .../reagent_forging/code/crafting_bench.dm | 1 - .../modules/reagent_forging/code/forge.dm | 34 +++++++++--------- .../reagent_forging/code/water_basin.dm | 2 -- .../icons/obj/forge_structures.dmi | Bin 2159 -> 1732 bytes 6 files changed, 22 insertions(+), 34 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_ash_walker1_skyrat.dmm b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_ash_walker1_skyrat.dmm index b2c5a56c30a..19223c30baf 100644 --- a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_ash_walker1_skyrat.dmm +++ b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_ash_walker1_skyrat.dmm @@ -498,9 +498,7 @@ /turf/open/misc/sandy_dirt/icemoon, /area/ruin/unpowered/ash_walkers) "mV" = ( -/obj/structure/reagent_anvil{ - primitive = 1 - }, +/obj/structure/reagent_anvil, /obj/item/forging/hammer/primitive, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 10 @@ -699,9 +697,7 @@ /turf/open/lava/plasma/ice_moon, /area/ruin/unpowered/ash_walkers) "rX" = ( -/obj/structure/reagent_forge{ - primitive = 1 - }, +/obj/structure/reagent_forge, /turf/open/floor/stone/icemoon, /area/ruin/unpowered/ash_walkers) "rZ" = ( @@ -1676,9 +1672,7 @@ /turf/open/misc/asteroid/snow/icemoon, /area/ruin/unpowered/ash_walkers) "ST" = ( -/obj/structure/reagent_forge{ - primitive = 1 - }, +/obj/structure/reagent_forge, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 6 }, diff --git a/modular_skyrat/modules/reagent_forging/code/anvil.dm b/modular_skyrat/modules/reagent_forging/code/anvil.dm index b7eb4f52477..99cfb0fe8e2 100644 --- a/modular_skyrat/modules/reagent_forging/code/anvil.dm +++ b/modular_skyrat/modules/reagent_forging/code/anvil.dm @@ -6,14 +6,9 @@ anchored = TRUE density = TRUE - ///if on the mining zlevel, it is primitive and has a different icon - var/primitive = FALSE /obj/structure/reagent_anvil/Initialize(mapload) . = ..() - if(is_mining_level(z)) - primitive = TRUE - icon_state = "primitive_anvil_empty" /obj/structure/reagent_anvil/update_appearance() . = ..() @@ -22,7 +17,7 @@ return var/image/overlayed_item = image(icon = contents[1].icon, icon_state = contents[1].icon_state) - overlayed_item.transform = matrix(1.5, 0, 0, 0, 0.8, 0) + overlayed_item.transform = matrix(, 0, 0, 0, 0.8, 0) add_overlay(overlayed_item) /obj/structure/reagent_anvil/wrench_act(mob/living/user, obj/item/tool) diff --git a/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm b/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm index f6e89e8f8d4..94a918217ab 100644 --- a/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm +++ b/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm @@ -96,7 +96,6 @@ return var/image/overlayed_item = image(icon = contents[1].icon, icon_state = contents[1].icon_state) - overlayed_item.transform = matrix(1.5, 0, 0, 0, 0.8, 0) add_overlay(overlayed_item) //when picking a design or clearing a design diff --git a/modular_skyrat/modules/reagent_forging/code/forge.dm b/modular_skyrat/modules/reagent_forging/code/forge.dm index ea410255081..9b9f598e8ad 100644 --- a/modular_skyrat/modules/reagent_forging/code/forge.dm +++ b/modular_skyrat/modules/reagent_forging/code/forge.dm @@ -50,8 +50,6 @@ COOLDOWN_DECLARE(forging_cooldown) ///the variable that stops spamming var/in_use = FALSE - ///if it isn't on the station zlevel, it is primitive (different icon) - var/primitive = FALSE ///the forge level, which will upgrade the forge (goliath/sinew/core upgrades) var/forge_level = FORGE_LEVEL_ZERO var/static/list/choice_list = list( @@ -125,20 +123,26 @@ . += span_notice("
[src] is currently [forge_temperature] degrees hot, going towards [target_temperature] degrees.
") if(reagent_forging) - . += span_warning("[src] has a red tinge, it is ready to imbue chemicals into reagent objects.") + . += span_warning("[src] has a fine gold trim, it is ready to imbue chemicals into reagent objects.") /obj/structure/reagent_forge/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) - - if(is_mining_level(z)) - primitive = TRUE - icon_state = "primitive_forge_empty" + update_appearance() /obj/structure/reagent_forge/Destroy() STOP_PROCESSING(SSobj, src) + QDEL_NULL(particles) . = ..() +/obj/structure/reagent_forge/update_appearance(updates) + . = ..() + cut_overlays() + if(!reagent_forging) + return + var/image/gold_overlay = image(icon = icon, icon_state = "forge_masterwork_trim") + add_overlay(gold_overlay) + /** * Here we check both strong (coal) and weak (wood) fuel */ @@ -162,8 +166,6 @@ if(reagent_forging) //We really only need to do it once! return reagent_forging = TRUE - balloon_alert_to_viewers("gurgles!") - color = "#ff5151" name = "reagent forge" desc = "[initial(desc)]
It has the ability to imbue forged metals with chemicals!" @@ -183,18 +185,18 @@ return forge_temperature -= 5 + if(particles) + QDEL_NULL(particles) return else if(forge_temperature < target_temperature && (forge_fuel_weak || forge_fuel_strong)) //below temp with fuel needs to rise forge_temperature += 5 - - if(forge_temperature > 0) - icon_state = "[primitive ? "primitive_" : ""]forge_full" + icon_state = "forge_full" set_light(3, 1, LIGHT_COLOR_FIRE) - - else if(forge_temperature <= 0) - icon_state = "[primitive ? "primitive_" : ""]forge_empty" - set_light(0) + if(particles) + return + particles = new /particles/smoke + particles.position = list(6, 4, 0) /** * Here we fix any weird in_use bugs diff --git a/modular_skyrat/modules/reagent_forging/code/water_basin.dm b/modular_skyrat/modules/reagent_forging/code/water_basin.dm index e6381bed37d..63c852d6a5f 100644 --- a/modular_skyrat/modules/reagent_forging/code/water_basin.dm +++ b/modular_skyrat/modules/reagent_forging/code/water_basin.dm @@ -11,8 +11,6 @@ /obj/structure/reagent_water_basin/Initialize(mapload) . = ..() - if(is_mining_level(z)) - icon_state = "primitive_water_basin" /obj/structure/reagent_water_basin/Destroy() QDEL_NULL(fishable) diff --git a/modular_skyrat/modules/reagent_forging/icons/obj/forge_structures.dmi b/modular_skyrat/modules/reagent_forging/icons/obj/forge_structures.dmi index facb6092a58a664cdb32af0f24d837c3aace877d..d3cbe12a5424f6e5cd34a228828da8e882cd5560 100644 GIT binary patch literal 1732 zcmV;#20QtQP)P)BpdH|NoTxe>D4&KKqwJ|Nrv) zpGE)wc>A(X`;R^U|B3(qzW@K^`-(dIx>NhFP5=Lnwt-WKWm*6K)%%)4`+_$A|A_ml zOaK4b`;9yQ|Cj&&hfgRQkzF05X&>gMPXEqZSy@_SWM(iI5wo+iwY9bK^77f)*)A3k z%E-ztE-wH7>ic~&`=?3&|IPpZnXhwB`-eFH|91cXzb^zZ>;M1&0d!JMQvg8b*k%9# z0K9rsSad{Xb7OL8aCB*JZU6vyoRyHx4uUWcgwO3$G;lS>AFf`E#Bh*TXbLQJBNVf( zG`zhP4PN9x_OLUP`LfBz;+$TyTwHD$AAl_OMw~>l-Erozayppffin%*X!kMJDF;DD zK5UYOvS=dCDkK}yJ!dtk4!)Yeqp2o6bIJ_ZO6VSLT;k?#-BSary7jYd|5uZcLaWAi zyqV_5mZWNjrjZ4hQm;DLDI5Oad%8hYkn=3xGF}cxAw`EI(r` zpa4F39BHx&0ap;PX0xdX5Wpu-oJ2ZNg`fegF`%i00Wv=YR3R`q=&e>O7%2e+0Ymwx zh^i1K@bn3i0zd`a%&!Op02fjrz??X(kvf2QQ+=SBqO9NyNodA|-X7tG_0c2}gF$CZt(AiEQRRh$L4rQau@DQkO z&&(p}L*)Uwlg3Ch5R?_n!mVNjx(EtjH3T?43pWf1?SK#h!UzJCY8Wtk25zJRD!3LnT?dUgj-xhG zBo8%U64j=CR;x{8I$IM71Jv1I07jieIba(jrYAiH;B}zRHUK0)Xk)}!b_Hg@Rbc3B z3NZ3#ZH$=nW~a}dL$c%_w=rYc{F%xAWtI#_`X7rBwy>FcQd!b|`@Q71?pELme-ZyUe`=kT)Joj8V?)3M*ai_ocjXV9lZ`}FF z^NlC2eAdt)i9`VH2%p)OR;~O9KU>b2`R@y?B#x0aVhw|hHx9V{-ctlYV~nlsN= z?=7w^Ey>`Y*7*Gge|5SKABsnh?CU^?$B&=L*wbfXbyb-2T;etbU=hy`JbKY#J^ zRac1Do11Um2y-12`Fr2^zkjoH`g`B_f3G-xYbcHn5W>h);KUT+KJr-lRDZywnzh*H8<-`4AXMkoPLCA1@5Nb=DJfL`sLng3latIFZ; zlM3GJe!u^ae4q-9@u7zu{$2s}SNv!Wd;ow`4u5Y95xoZG0Qvsj7@~N4dpoWIaQOS3 z0U09mB3nhSK{kDezaQ)lhaZu2Ir8tX0>~`d+uh$E?hgmq5=iQR0Lwz?7XYxomjIc6 z$dELMXUX~mA@{+NVt>E4JCr3b&re77#0KUw+alPk30a_8AufY zoY$b(-w$?V1^ZqAhriFg2I;To&S~nf-|8yc0Acx+TnylnFko#j7OTxUlEY+?y9$e=j=MKCOTLB8dMl12CSM=sVS_G;g<-d zR&t@g*RKx1fN=a0q1QKRkp1ryK%u{Hg!uW$(Mtqf0V<-8D=6Xb8*_7Tm%K#SlEM{? akNgCUWc94^U+d!l0000{8XU; literal 2159 zcmV-#2$1)QP)GTcJ7#>L_vu%td2be|0L7o;<7;D zL3-BLZoxNHbP?hs^wD71B%V2sYUBM*s}9=f%p7GZhQT+jseXU=#lKM*;`qDIogHN& z91j-=6pu8@*z-XK$(M;+(7VTAv)yT1eV`j4!1(HQ9da61Q zg-JxQ+A1XMy+7Ocf6tRiz}yA`0!DjgDOUT3VOD~X4pxhTL?V$$B!+4|&QYz$3${bV z*5kZH#Mk2m+wTv1SMZ4W+-YF$haA-5kaH|P_jwdQ>vJrA zkYE%a;X~^$?%~u3F74se2;K+4>j9fVI6$Gpi0^%V9{@i-kNAMYi0=c3Y>)N8^aR=7 z>0uklHxS34oFK>J2L=}OFx%S(dewvfBv{(R9FIR@U}g_9r&|xU)v$q?JcB4;+}y-)#~);6w4b$K&|i=8wkbt^uS690O<% z?8glpJOfyKYXFZwZs6b>SkS|)pCg0We(#UK!#&K0;yVTw^)S1~ciS9X1B-f?55>0z zmh~_@>>bkIIqa>0Wj)M?;&&WB7Pd#kOF4clY>$YS@&Y>)?zINT4uyNI!Ha4{Yw+WU z*5EV(*++mxB9TZW5{WdT52f5WEYj(8`gn5_r{Ce>i+vPJk z_fn5NSbp~aF7CYaLdV z+XhJ=1681yyE&pX;^4vKmtF(wZ_RCr5A)Opw&s0? zkMq<9w&o_oB|H^>YyRd2s;YtnyPDv9e!X5{1L{W>URAq(p4nk3rg&k(n@!-`-cm?H81MQ*2SxOKEHZ;J}>Ip*2QbgK!U%30ax=m8Tj8Da8pEal9Naz5{X1w zU#XIAZk|-Cww{|$Q0n|ZZazh+^8>j#C{drc=LcSnPp{9rwe?rxbL#U>j2Gd3o3Z-4 zPg3Uxp3k*x^&RT;MI^uekDni~C4Pi^_5Yar^?!tW`Nh1LU7t^#A9y-1^4Is5^8EGv zr95|ee1-D^xf58%uX*eHEAaklo~ORQ9?w(XUwnQbcWrZVZ8UcRWFU6}WPn5>kw_#` z4lOME=GX6dZ~Zh6anbQ*_@w_2fFkP|duRMh@Kk;NUL+pqgN!^?f4?^>%QLKg#x{|W zPpQAFR%c^gH$5X8$jYbG-_@$;vS~~N>_0>@^YQw7@2zPdL_8Vf=0^9jk$LFW-@&$C z+X%+f-#}&_Scn14Un+pXDuCV}Ux)_|5CeMr`VngMRPajNcYx=AaTV-?xp~Tf-sQaY z{UOZF@461u-^=a=(8{06a&w!1?=WxxQ*iK!lV`7oGV>^Z#6ej)vzVETLoS*|U+cOS z7;h$WG0dBR^?L(@wZ|}h^J?OAA!>D1!Rwt67_Y~<3LtbFG05u%cop-M0eu`5mWSp3^)hon(M&oD&=k`Q7$^JmUVgBz}Xn+ABVe;=5@Q1 zY6H7g{cKU*0+($ohPil%Ck-}b zyu25Wu)4exFR=#Y`*8GoYMjqWdUdWE{OK-Mf4u-ApdtUGTa0mNG0y!Kf9Dxk)&seD z!NbC*sUGro;g1FQd@dJ_S?rB(Abys62LAnnQ?LI#`Mi_*6y1OAj}%+f=6Gzq|f7_Z$a3zj}l5N(KhMv=Zai z#j6;oyw7{S!At|H#`vs{URa}k@0Y%PUe!N8b@}u2Q>r`q)k@v|xCX}gBm)8}*iD~+ z5J7?_HF$HmG>xRsr8I9mznc()2B4S648(kj0hPUEQq3Le$MGUXaDJeH-v}u$M=8V+ z8jHXntShAirWPp&4Ag4ZQj2He*uuW!{V11RKP7a=)rkC}OQcdL(3~WCO-PBI44l?U*A6NT`KMRfVw1KVb_mw$H^QTJp lbs)j>Yy5RA%}J!q^dBbXpMLw$e>(sG002ovPDHLkV1juwJF)-(