From 5680b326187a85f7da76cd0bebf98bcf1469073d Mon Sep 17 00:00:00 2001 From: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com> Date: Sat, 6 Jan 2024 13:14:42 +0100 Subject: [PATCH] Rock walls to use 3/4 sprites (#18137) * a * huhhhh * agony * idk * 7 * huh * a --------- Co-authored-by: DreamySkrell <> --- code/modules/mining/mine_turfs.dm | 24 ++++------ .../DreamySkrell-asteroid-walls-3-4.yml | 41 ++++++++++++++++++ icons/turf/smooth/rock_dense.dmi | Bin 1318 -> 1371 bytes 3 files changed, 49 insertions(+), 16 deletions(-) create mode 100644 html/changelogs/DreamySkrell-asteroid-walls-3-4.yml diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 16ae2e7d941..60388e4ef41 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -2,7 +2,7 @@ /turf/unsimulated/mineral name = "impassable rock" icon = 'icons/turf/smooth/rock_dense.dmi' - icon_state = "wall" + icon_state = "preview_wall_unsimulated" blocks_air = TRUE density = TRUE gender = PLURAL @@ -22,16 +22,15 @@ var/list/mineral_can_smooth_with = list( /turf/simulated/mineral //wall piece name = "rock" - icon = 'icons/turf/map_placeholders.dmi' - icon_state = "rock" + icon = 'icons/turf/smooth/rock_dense.dmi' + icon_state = "preview_wall" desc = "It's a greyish rock. Exciting." gender = PLURAL - var/icon/actual_icon = 'icons/turf/smooth/rock_wall.dmi' + var/icon/actual_icon = 'icons/turf/smooth/rock_dense.dmi' layer = ON_TURF_LAYER // canSmoothWith is set in Initialize(). smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON - smoothing_hints = SMOOTHHINT_CUT_F | SMOOTHHINT_ONLY_MATCH_TURF | SMOOTHHINT_TARGETS_NOT_UNIQUE initial_gas = null opacity = TRUE @@ -83,8 +82,6 @@ var/list/mineral_can_smooth_with = list( if(smoothing_flags) canSmoothWith = mineral_can_smooth_with - pixel_x = -4 - pixel_y = -4 rock_health = rand(10,20) @@ -129,6 +126,7 @@ var/list/mineral_can_smooth_with = list( if(1.0) mined_ore = 2 //some of the stuff gets blown up GetDrilled() + SSicon_smooth.add_to_queue_neighbors(src) /turf/simulated/mineral/bullet_act(var/obj/item/projectile/Proj) if(istype(Proj, /obj/item/projectile/beam/plasmacutter)) @@ -167,19 +165,16 @@ var/list/mineral_can_smooth_with = list( //For use in non-station z-levels as decoration. /turf/unsimulated/mineral/asteroid name = "rock" - icon = 'icons/turf/map_placeholders.dmi' - icon_state = "rock" desc = "It's a greyish rock. Exciting." opacity = TRUE - var/icon/actual_icon = 'icons/turf/smooth/rock_wall.dmi' + var/icon/actual_icon = 'icons/turf/smooth/rock_dense.dmi' layer = 2.01 var/list/asteroid_can_smooth_with = list( /turf/unsimulated/mineral, /turf/unsimulated/mineral/asteroid ) smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON - smoothing_hints = SMOOTHHINT_CUT_F | SMOOTHHINT_ONLY_MATCH_TURF | SMOOTHHINT_TARGETS_NOT_UNIQUE - color = null + color = "#705d40" /turf/unsimulated/mineral/asteroid/Initialize(mapload) SHOULD_CALL_PARENT(FALSE) @@ -203,8 +198,6 @@ var/list/mineral_can_smooth_with = list( if(smoothing_flags) canSmoothWith = asteroid_can_smooth_with - pixel_x = -4 - pixel_y = -4 return INITIALIZE_HINT_NORMAL @@ -231,7 +224,6 @@ var/list/mineral_can_smooth_with = list( clear_ore_effects() if(!mineral) name = "\improper Rock" - icon_state = "rock" return name = "\improper [mineral.display_name] deposit" new /obj/effect/mineral(src, mineral) @@ -626,7 +618,6 @@ var/list/mineral_can_smooth_with = list( icon_state = "" desc = "An exposed developer texture. Someone wasn't paying attention." smoothing_flags = SMOOTH_FALSE - smoothing_hints = SMOOTHHINT_CUT_F | SMOOTHHINT_ONLY_MATCH_TURF | SMOOTHHINT_TARGETS_NOT_UNIQUE gender = PLURAL base_icon = 'icons/turf/map_placeholders.dmi' base_icon_state = "ash" @@ -915,4 +906,5 @@ var/list/asteroid_floor_smooth = list( /turf/simulated/mineral/Destroy() clear_ore_effects() + SSicon_smooth.add_to_queue_neighbors(src) . = ..() diff --git a/html/changelogs/DreamySkrell-asteroid-walls-3-4.yml b/html/changelogs/DreamySkrell-asteroid-walls-3-4.yml new file mode 100644 index 00000000000..96addcbc32c --- /dev/null +++ b/html/changelogs/DreamySkrell-asteroid-walls-3-4.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: DreamySkrell + +# 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: + - rscadd: "Asteroid and exoplanet rock walls now use the 3/4 sprites." diff --git a/icons/turf/smooth/rock_dense.dmi b/icons/turf/smooth/rock_dense.dmi index b8d2ab55c67258d146e6479d7fb3d6cacc570571..39eb62347ef7ef7c7db486ed5080610877cc3f70 100644 GIT binary patch literal 1371 zcmV-h1*H0kP)SCcUSTvT{g}c&_#lHy$AVE^U^Hmw)5I_uot)Kv z{+bG4IKT*iVblV8@`h6n=*b&KBcMkCdh&Y&U{Cr!kRS^w@{lACX&M1ZdBXul08Es| zWYNp1O{>`djr-MlJ+CHR4cUioxj(b$W~2qF-@8iEboJ*4@CH|77ryEaTl@e31Q=l66JM{@d(X#@8>>t60T7~cg z0NTH66&M4cy>R>qj10g zWbcCQ+sVlO5k6|~A}>8O2q5+fKAm>|H# zH%=9R?PCL;%*ppc=!PwB00Nfatu%EkH$=2NF@zXk7Hc@z0wB~dqzA+#vsm_Ek;TWi z5j|ilfMUauOszL|9RVP7vf<(zLdI@L4~%6l=76M7<{rLnF+k?P%C7*hEF(9f2NYL4 zodB!=p4do8R+5qC5@3b_9HobSAt3HqR{&zKZbJa8Ni7}ABlhNQ{rg}8tOdZWMC&>P zu&%MCvRod26d=m8<<0WoKK}tqum1og?DA~+1WdpLOh8!<9TW`k(NU@T55$ z{9gs!2LRUHfv5n6CJ$gKS)n3P9f6U0s9c8NtMqi(whM}o|HryKzcLa{c8gp_)P!#>r?Lp@cmTJgcLma z_WA!GPYn_O)8M(j6RrRpe`(P3y`pafe+58?1}l0ZbOU(dsvZd`zSIZsbzKN4zSIgZ zUp5j4kMwrH9#2XQ#GMQD3(NE)k3qU`g!Bu5?fy}|Z-n#57OHKdw$?=gFwFk*zyDUJ`vK7 z?O?#3AISHKkbV)cQqBh;{Q_Xi59E9R(k}s8qyQY{_d%dRt4zQIOuz(8zywUd1WdpL dOu+vN_ybXwJv>L1()R!W002ovPDHLkV1k;+cUJ%a literal 1318 zcmV+>1=;$EP)005u_0{{R3dEt5<0000LP)t-sz`(#@ zU|?`?a7jr?j*gB1006+iz%{koMF0Q*0d!JMQvg8b*k%9#0JVBlSad{Xb7OL8aCB*J zZU6vyoQ>153d0~2h2dGBLXz21qidIvP%<>{U>j4Vi3OGV`jrN{70-4rd|ZA6TXr5U zL_t(&f$f^@apWKjhSLIU8nD(4cu50cXyN*A z-O3n_*6oBHY^U{(6Cu^UI%ld0$D1~8U1gc}cx?^T!6 zl!^6&*b(sHSm2Upd?TQdLv+5eUgFz4OzaCOa87YT*Sg(1=Vrl>P@tbD4{0Jmd`mJ# z=)mEq(+Fow4!Bt&gb9Hp!5#h;(NDnwbiR?`dB)*bm?HEO02xDvjrd=&s}Tj_7*6=3 z5#ryxSR!;e<6HwcA&^geV!`1^0R?(9aB(G=3xRn~ECiUNzL|i*7f%wQ%gr}^9`B`(JS#ApwEb!8H$Ug}3kB;XF|z+X0QvQj0>}GjHm!&;`)56n**_B%b`CgE6~@|d|2!F_$8i4)&XhI- zpiQw3fc$!?1?tlVMS2$~SuZJYynoh@A=&>PfKi_|dH>w+vSk}FuYGO<4T)Xb;~rpc zEU4uL&Y)nk9*jNUob(Zw`62nr$${&Ndm(W6*?a+C!2c4c|Hg>*pw!fQ(2whbYy_?z z5;v|7^1yi&L*EVK`XCQP|08f%AEX5!0(9_RML4Vv3L>l&uN&6~B|sA4s6NOlRtg-| z2OI6=IWmUh`k(~pE8ws`$O3QZe*})}gDfy?f^r8O)(6?$X;}O*ZEoZG;3A0d2s~RK z3?52fv={Y&M_v&wrF&z!&fZd;w1ar4Hg3{t%E?TRNaX52}C?J*Wio zYD)`b^`H(Y(1SW)Lxr6K-meGpX8}6k!fF}i81mvs2LxWeseo`j@O~cnbza=NZ}_J& z?uF0u;u2w_XsZWqlD7OQjZLH)_;r3#>zhK4S$^}*hKLkqCf4}13s z^}wxu*t<_?NSn2O*t<_?N$gTT?A<4{BzCDE_U;o}fTe!eyH98Vmil4uKA~w0bN#S) zpU?vIYwfXpTTc!Ax?kA4{-+0S^}`E+YyGfypHL6n>W97ighpU+y?UVmxYiGQ^+FSH cZ)bsj0ZSk#v~gL{{{R3007*qoM6N<$g6k+@0ssI2