From 7f532a0f805b6da983ba976ae7f6f6f00fc2038c Mon Sep 17 00:00:00 2001 From: Bib Bob Date: Mon, 13 Feb 2023 17:49:59 -0600 Subject: [PATCH 1/6] the start --- .../turfs/simulated/outdoors/lava_land.dm | 96 ++++++++++++++++++ modular_chomp/icons/turf/lava_land.dmi | Bin 0 -> 5026 bytes vorestation.dme | 1 + 3 files changed, 97 insertions(+) create mode 100644 modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm create mode 100644 modular_chomp/icons/turf/lava_land.dmi diff --git a/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm b/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm new file mode 100644 index 0000000000..e940b369ae --- /dev/null +++ b/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm @@ -0,0 +1,96 @@ +/* Testing +/turf/simulated/floor/outdoors/lava_land/sand + name = "sand" + desc = "Sandy, taste salty and gritty." + icon = 'modular_chomp/icons/turf/lava_land.dmi' + edge_blending_priority = 2 + turf_layers = list(/turf/simulated/floor/outdoors/rocks) + initial_flooring = /decl/flooring/sand + can_dig = false +*/ + +/turf/simulated/floor/outdoors/lava_land/ash + name = "ash" + desc = "A thin soot of grey ash." + icon = 'modular_chomp/icons/turf/lava_land.dmi' + icon_state = "ash" + edge_blending_priority = 2 +// turf_layers = list(/turf/simulated/floor/outdoors/lava_land/ash) idk how these work + +/* Testing +/decl/flooring/outdoors/sand + name = "sand" + desc = "Salty and gritty." + icon = 'modular_chomp/icons/turf/lava_land.dmi' + icon_base = "sand" + footstep_sounds = list("human" = list( + 'sound/effects/footstep/asteroid1.ogg', + 'sound/effects/footstep/asteroid2.ogg', + 'sound/effects/footstep/asteroid3.ogg', + 'sound/effects/footstep/asteroid4.ogg', + 'sound/effects/footstep/asteroid5.ogg', + 'sound/effects/footstep/MedDirt1.ogg', + 'sound/effects/footstep/MedDirt2.ogg', + 'sound/effects/footstep/MedDirt3.ogg', + 'sound/effects/footstep/MedDirt4.ogg')) + +/turf/simulated/floor/outdoors/sand/Initialize(mapload) + var/possiblesands = list( + "ironsand1" = 50, + "ironsand2" = 1, + "ironsand3" = 1, + "ironsand4" = 1, + "ironsand5" = 1, + "ironsand6" = 1, + "ironsand7" = 1, + "ironsand8" = 1, + "ironsand9" = 1, + "ironsand10" = 1, + "ironsand11" = 1, + "ironsand12" = 1, + "ironsand13" = 1, + "ironsand14" = 1, + "ironsand15" = 1 + + ) + flooring_override = pickweight(possiblesands) + return ..() + +/turf/simulated/floor/water/hotspring + name = "Hotsprings" + desc = "A natural hotspring connecting to an aquifer. It seems the facility was built ontop of it." + edge_blending_priority = -2 + movement_cost = 8 + depth = 2 + water_state = "water_shallow" + outdoors = FALSE + +/turf/simulated/floor/water/hotspring/Entered(atom/movable/AM, atom/oldloc) + if(istype(AM, /mob/living)) + var/mob/living/L = AM + L.update_water() + if(L.check_submerged() <= 0) + return + if(!istype(oldloc, /turf/simulated/floor/water/hotspring)) + to_chat(L, "You feel an overwhelming wave of warmth from entering \the [src]!") + AM.water_act(5) + ..() + + +*/ + +/turf/simulated/mineral/lava_land + name = "ashen rock" + desc = "A rock wall covered in a thick layer of ash." + icon = 'modular_chomp/icons/turf/lava_land.dmi' + icon_state = "ashrock" + edge_blending_priority = 3 +// turf_layers = list(/turf/simulated/floor/outdoors/lava_land/ash) + +/turf/simulated/floor/outdoors/lava_land/basalt + name = "basalt" + desc = "A hard cracked black rock formed from rapidly cooling lava." + icon = 'modular_chomp/icons/turf/lava_land.dmi' + icon_state = "basalt0" + edge_blending_priority = 3 + turf_layers = list(/turf/simulated/floor/outdoors/lava_land/ash) diff --git a/modular_chomp/icons/turf/lava_land.dmi b/modular_chomp/icons/turf/lava_land.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e04952415fd682d186fba4331099598530a8abf8 GIT binary patch literal 5026 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 literal 0 HcmV?d00001 diff --git a/vorestation.dme b/vorestation.dme index 7745fa01f2..ac88f3b17e 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4529,6 +4529,7 @@ #include "modular_chomp\code\game\objects\structures\watercloset_ch.dm" #include "modular_chomp\code\game\objects\structures\crate_lockers\largecrate.dm" #include "modular_chomp\code\game\turfs\simulated\outdoors\desert_planet.dm" +#include "modular_chomp\code\game\turfs\simulated\outdoors\lava_land.dm" #include "modular_chomp\code\modules\admin\functions\modify_traits.dm" #include "modular_chomp\code\modules\artifice\deadringer.dm" #include "modular_chomp\code\modules\client\preferences.dm" From c0bbfc041bf3a20c1c1f1bad347938d3d204a062 Mon Sep 17 00:00:00 2001 From: Bib Bob Date: Mon, 13 Feb 2023 18:08:07 -0600 Subject: [PATCH 2/6] saddsa --- .../turfs/simulated/outdoors/lava_land.dm | 37 ++++++++++-------- modular_chomp/icons/turf/lava_land_edge.dmi | Bin 0 -> 5026 bytes 2 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 modular_chomp/icons/turf/lava_land_edge.dmi diff --git a/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm b/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm index e940b369ae..84773abad2 100644 --- a/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm +++ b/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm @@ -8,13 +8,32 @@ initial_flooring = /decl/flooring/sand can_dig = false */ +/turf/simulated/floor/outdoors/lava_land + icon = 'modular_chomp/icons/turf/lava_land.dmi' + icon_edge = 'modular_chomp/icons/turf/lava_land_edge.dmi' + name = "lavaland base turf" + desc = "This should not exist" /turf/simulated/floor/outdoors/lava_land/ash name = "ash" desc = "A thin soot of grey ash." - icon = 'modular_chomp/icons/turf/lava_land.dmi' icon_state = "ash" edge_blending_priority = 2 + +/turf/simulated/mineral/lava_land + name = "ashen rock" + desc = "A rock wall covered in a thick layer of ash." + icon_state = "ashrock" + edge_blending_priority = 3 +// turf_layers = list(/turf/simulated/floor/outdoors/lava_land/ash) + +/turf/simulated/floor/outdoors/lava_land/basalt + name = "basalt" + desc = "A hard cracked black rock formed from rapidly cooling lava." + icon_state = "basalt0" + edge_blending_priority = 3 + turf_layers = list(/turf/simulated/floor/outdoors/lava_land/ash) + // turf_layers = list(/turf/simulated/floor/outdoors/lava_land/ash) idk how these work /* Testing @@ -78,19 +97,3 @@ */ - -/turf/simulated/mineral/lava_land - name = "ashen rock" - desc = "A rock wall covered in a thick layer of ash." - icon = 'modular_chomp/icons/turf/lava_land.dmi' - icon_state = "ashrock" - edge_blending_priority = 3 -// turf_layers = list(/turf/simulated/floor/outdoors/lava_land/ash) - -/turf/simulated/floor/outdoors/lava_land/basalt - name = "basalt" - desc = "A hard cracked black rock formed from rapidly cooling lava." - icon = 'modular_chomp/icons/turf/lava_land.dmi' - icon_state = "basalt0" - edge_blending_priority = 3 - turf_layers = list(/turf/simulated/floor/outdoors/lava_land/ash) diff --git a/modular_chomp/icons/turf/lava_land_edge.dmi b/modular_chomp/icons/turf/lava_land_edge.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e04952415fd682d186fba4331099598530a8abf8 GIT binary patch literal 5026 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 literal 0 HcmV?d00001 From 60a299d5ec99c09a646c55cffda2096a307ca766 Mon Sep 17 00:00:00 2001 From: Bib Bob Date: Mon, 13 Feb 2023 18:17:55 -0600 Subject: [PATCH 3/6] merge later vers --- modular_chomp/icons/turf/lava_land_edge.dmi | Bin 5026 -> 3038 bytes vorestation.dme | 3 --- 2 files changed, 3 deletions(-) diff --git a/modular_chomp/icons/turf/lava_land_edge.dmi b/modular_chomp/icons/turf/lava_land_edge.dmi index e04952415fd682d186fba4331099598530a8abf8..913b5b2a17f952bb972bb53d47c2f0fbb4542a32 100644 GIT binary patch delta 2766 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 delta 4772 zcmW+)c|6qJ_s7r(86_r6GYM&tCDD*(N<3}PgG!WLLM05Nhr#$*vPG6CYsQ*nmoG|Y zhOCK^J=@r7?AvT+n3O-C9&-H~V`}O>l`dI(H$*29vQ@Ta1 zhjfph)lt9mPAqvzRMA6+7wR6RY5qH=`L6WY@|QAf&A;o{*g1e)n?OLV zz8E^KB>JSOW^n*nLo`SdB{zOs7k?uY{e{}N;Wo9~4nN7X1IFA(t@iMlk@O_ee=VE(0|&vm@Vie-_THB9dQ>qg6J#8VNAn4 zD0#wa4%1UcbkzPEsK%(+yAD@$qNgQ3`Z!lVi*D0+7;m}({hAK!dX!JW(_F3rH@EuO zlMg~RA56>4eiM>OGdwQ^GKMbgy3&^EBPz<*glr<=u_@`zCa-W(2yKJ@QQM8WuE@yo zm5bQ{UNZb7B#PP8M}OD%9PRs!CT$m~B${CUJ>?DH9@l>6TaZv7Xv|T48yupl6TK*b zc(|jpK4WZYX9Tnmn`Z{GS|n9I%|SYcHr6Pyl@T=KIQ1jDkMq-rJfLy(cHPq)w9v)@ zqn3o&pIYRZ+)A%aab)ji-~r+_lhI8*e&mOS9%7>R)9gNX1N@92y``4ZC7Zc}-9Rbt zcRtP=-0x+SdDbJr?|*hfhKS~KVb~XLDJC4f0NE~;%fRw}!%NdoqNy(p>wnRu&Ci&L zHylk2&XA=lhrmUfpC^4gi!se6;NZbEWnayGpog)iQwB~)SjpzuXzfOMT`4r;gq3{k-KJFi`&c z+OiAQ7>EcB5z9HhLBOHeXz33$(vL2haDaOHt*`+jA3Xoak3rkV@W2-(eCN|k)7Lwa z{~hZ1t*VaB>z%;u$D8pcD6t^;;VEOI(9L5wT)jTnx$9+y=wvhJtouTL`r5G}bX!%# z2*+5;C+iYTNmre(^@m8;+dj%R^s`G0)J3ZTjI`E*wO#3ot2sookea1)wf>R%t*d8{ zA}I;SKepq_FP`GfGRu!l>jx1(|MMz);>t!5BXe8x@63!jj;eUbbJ_XkqFbb}tou2F zk2yp=Z;1s({>_clG#3X^#Ny)dV0DM$hbliN+#sOV$XHqNy1|S~%Do4Qpl}}$qD8R_ zP?nKJOVRDxt8A9~h)UY|;+mkp<2NI9q)Ap$s3Ew$)UBJ z6crYAg$c1;#bw30)ChFghymN?&Wi{@)(NvZ+gyo<28XP* z+z*~c`_qr@wknU%bO0WspFBpK*O`Zp>UK6P@;zKZ^FBT_UqZV`2(V4$%aqO1-zrmko z6<@cUf?{QNv|pc*#wgkuzTDTLbMo_oZx(*+kE$PvO@}HM(G_~A*oECwshT4%KWf+jPoBugUlRyxQ^oNhb{DiBTS#aHB*Uggr5*O#^Wg-MDF9Kb!D- zUfNjc^LA#hNQRkvxk+tcT31$jL20||nX8Gf;EM0dVYrf$tt~B{tZ&&yDkPQl$=h2& z*Qv)?#D?wW_+W+YM{ABd^I~~XDO$j*M-B-yO^-9W>r(D}7lf4L@xAg_KPk@H@!Ad#tIV}clS8!boF4Qsm_KN~ z{ztg%kK^l7wBg{6&{pm*?3U;qj}B612~ucrqGov6)FcUg`~)PUYg_rb0VCrfwsBEx+$rm+cr*bcTFIsMR zN(wmouJmx0w<0q_(R|2t;yo`r+m<>~B;h>$YR%obfzSKXc)VFVYqGDg zj-LQ@lrcEE7_XUo_^|0i=(+{^`Z@L6ehzrR(X6+8ecc|BbVgLII-SAs&y?k86$UsD z(#)Hqmq4Abm}2=Ye`~aPRJ7k%UjN!hGbiIt2l#xMj19f6d8Zbk`RIDh8*R{^@fVAvplfW#E$E zW5V6MK1H8Ok@k78`SJud|C)rC_B{!W<94=$=leTLbTtB54_>23yS}_WvGtC{aoI{+7`3s-hPyK94K4)^dl;LHN27Hh@ zmx4`KeJZaI@C8@ymOQIkx3I2Glc~C(^d^PjE52P{fBN%VCLkQahubnZ1wO&;hdw#T zcDN%4EK~QWO>Lwv?ugOO_S)LjHk@1r>G3XEaf9*@{!EUGZ)d^z#GQuF8w1_3_Xs0) zM*{5repW8nOGBcgp#GO^DXJ3gGjr;~##_GkynfKY=2=$jdx}TzfnX|^OxzU|qMQb3 zp1bi(v2%bKf%cxpE*=5TZ$dh{PU49@xVVn9aOu-x{@&5xn5l zCEX6OLy$dv6_l#nOMf5IqVp|wtC+&Uni5}t7(E;wAj^l$5-#XDP#ya^z^l*kV4j8kWnvx@49i%R~Oh&KThr?g<=Y}8T`3lprRKm-zGQ80%N-QB0BBF zGRP={V`-Vq-Y5(pI$knQJFo)jo3VW6htK^?x=d$S#aC%9gRJmV?JjMb5@c(4z_a^&4_eHDqqF5G6N;O-#;3Q^Sg ztzGM_Qv>lwO#}#gL=3!yGQwF4>3DQL^h#*J-AxT!_p7X+4I8{u4T^FRRx#b<)jjB8 zy(k#>tm`pkfoIye{A^Y0F8)vK|wa#5fF1Af+e4}t?5sxY3^lK-%T^!lyz zbAfR<%p;A_vk?@!IbT$(0((|0gY@@2MyUs!3Q>u8RO@dFc4O>6#|Y>fPX%NmS71`1 zTZSJ;^Z3GQpu=4Qf`@n^3Jj}WhsVaS5G3Gog#sdPU6;jLommFSGH~Sr-Crr{V~$RL zfY$dU$bukFhZ*LA?dS4yQ241_!L7)e`D%t#F%>wr3<|ysIA$$_yw|ABygfsRoewW^ z0hrq9M>iAk?f>04Fii;jL{Ee-a9Lq7%AlfiiAo(PrkH<3Oj{UzAzI9}y=?jJBcVqk z6_-*v23X)u+(q)WVZ@Pf&ojW(B-#Q~21zH9is`#R9D4{H6`-@w#Ej;#AR7+6Cgv^> zZOs)R6Ot)EJeaW#4&&&)>3jIxQql#&x;Hk9PyM6e67lr|nv7niTk8w`A4ZJ#3>b7_p+`xUJrcibs7l6{1=VWJIM4jog z6dQ4fSx z7uhXV{jV1Qu}9d>f13MMo(>_nB*zb9=sr$J{vNBLC`gxCwr5T zmX!FUH#&h-v5I(1H^b*%Be>t^w6&D1=rkN2E}(W_#MKfj&49*Bdxf!-@@Yxz!kI7M z>=Q#E2=ATMi>uvT1!Faff{B*44?Iv6Dgc`Z=sEdCZhEoZ%<%|9A^Cm69RxC#n3w{L zhA`N&O{F{Fv9C=)?p;I@n({&5za(3}4qaM7$V_s{jU|G_N{Cawe<$~Hato}SH~YMn zD|9i557cpmUNknXbZoicNizGICY2e2MP?Xik?mdIs7O;;RnE(_K_Kgij&p{9E8&q~ zEtq7HQG?D$Va)K3^wX}?N|eQ;lHvh&!TqA`SE;;XRIT%O2#6v9)&rl*3O9OgjBjoL zoXSw%vtKAl*dAP3cc2I+czCn?FsnX=rIpTxoM+;cv>1Z2*}Zm5d%p9!pwFO)-!~sU zh9+C$ot$T*KWH(wh&&KrIHAYj>?IStSH1>Sz* zB=@=q!EJ8URmR{E{@5La*&vO{7w&AaFtoPTHWNfYX@~>vVIDxuPe~0Tq&mz$azjHd z`3f#?LYxi^&qwkF8ykJz1dOZWNvo%m{r^LhnWqySAJ?KBX=McTqYUB;-q`xwDi5@8 zuR4I2L6B}ShwwI(Tg|uPI_eaH- z>2W;+0O5`%cMO81$q4zt!_t$)^8fEmc8daSk*bOB^G(|MA=;6I`JG7k+tTP+3Hk15 z;hliMo%dYw!ny!)8!>8pY;+C&a-{B?Co5v27I69)f-V$zJLfetrtQqF`P&v;;{IG* tRboSG8Ju2zSdIWq=IKe}gBX8>VI^6~<2C{|C7+&Y=JR diff --git a/vorestation.dme b/vorestation.dme index 515aa06470..ac88f3b17e 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -71,7 +71,6 @@ #include "code\__defines\misc_ch.dm" #include "code\__defines\misc_vr.dm" #include "code\__defines\mobs.dm" -#include "code\__defines\mobs_ch.dm" #include "code\__defines\mobs_vr.dm" #include "code\__defines\mobs_yw.dm" #include "code\__defines\nifsoft.dm" @@ -4526,7 +4525,6 @@ #include "modular_chomp\code\game\machinery\airconditioner_ch.dm" #include "modular_chomp\code\game\machinery\autolathe_armory.dm" #include "modular_chomp\code\game\objects\items\clockwork\ratvarian_spear.dm" -#include "modular_chomp\code\game\objects\structures\desert_planet_structures.dm" #include "modular_chomp\code\game\objects\structures\loot_pile.dm" #include "modular_chomp\code\game\objects\structures\watercloset_ch.dm" #include "modular_chomp\code\game\objects\structures\crate_lockers\largecrate.dm" @@ -4593,7 +4591,6 @@ #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\gygax.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\occult\constructs\juggernaut.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\bigdragon.dm" -#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\desert_planet_mobs.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\greatwolf.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\swoopie.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\vore.dm" From ecf2a135900d4e051e87532ada65bd230f9ae8d1 Mon Sep 17 00:00:00 2001 From: Bib Bob Date: Mon, 13 Feb 2023 18:34:40 -0600 Subject: [PATCH 4/6] fuck you git --- vorestation.dme | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vorestation.dme b/vorestation.dme index ac88f3b17e..515aa06470 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -71,6 +71,7 @@ #include "code\__defines\misc_ch.dm" #include "code\__defines\misc_vr.dm" #include "code\__defines\mobs.dm" +#include "code\__defines\mobs_ch.dm" #include "code\__defines\mobs_vr.dm" #include "code\__defines\mobs_yw.dm" #include "code\__defines\nifsoft.dm" @@ -4525,6 +4526,7 @@ #include "modular_chomp\code\game\machinery\airconditioner_ch.dm" #include "modular_chomp\code\game\machinery\autolathe_armory.dm" #include "modular_chomp\code\game\objects\items\clockwork\ratvarian_spear.dm" +#include "modular_chomp\code\game\objects\structures\desert_planet_structures.dm" #include "modular_chomp\code\game\objects\structures\loot_pile.dm" #include "modular_chomp\code\game\objects\structures\watercloset_ch.dm" #include "modular_chomp\code\game\objects\structures\crate_lockers\largecrate.dm" @@ -4591,6 +4593,7 @@ #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\gygax.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\occult\constructs\juggernaut.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\bigdragon.dm" +#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\desert_planet_mobs.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\greatwolf.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\swoopie.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\vore.dm" From d6305dafef5179ea00f98123b9c13db3481aebfd Mon Sep 17 00:00:00 2001 From: Bib Bob Date: Mon, 13 Feb 2023 23:08:36 -0600 Subject: [PATCH 5/6] Walls fixed, random turfs, bleed through fixed --- .../turfs/simulated/outdoors/lava_land.dm | 64 +++++++++++++++--- modular_chomp/icons/turf/lava_land_edge.dmi | Bin 3038 -> 1410 bytes 2 files changed, 55 insertions(+), 9 deletions(-) diff --git a/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm b/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm index 84773abad2..49b20ba973 100644 --- a/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm +++ b/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm @@ -8,31 +8,77 @@ initial_flooring = /decl/flooring/sand can_dig = false */ -/turf/simulated/floor/outdoors/lava_land +/turf/simulated/floor/outdoors/lavaland icon = 'modular_chomp/icons/turf/lava_land.dmi' icon_edge = 'modular_chomp/icons/turf/lava_land_edge.dmi' name = "lavaland base turf" desc = "This should not exist" -/turf/simulated/floor/outdoors/lava_land/ash +/turf/simulated/floor/outdoors/lavaland/ash name = "ash" desc = "A thin soot of grey ash." icon_state = "ash" edge_blending_priority = 2 -/turf/simulated/mineral/lava_land +/turf/simulated/floor/outdoors/lavaland/ashrock name = "ashen rock" desc = "A rock wall covered in a thick layer of ash." icon_state = "ashrock" - edge_blending_priority = 3 -// turf_layers = list(/turf/simulated/floor/outdoors/lava_land/ash) + density = TRUE + opacity = TRUE + edge_blending_priority = 7 + initial_flooring = /decl/flooring/lavaland/ashrock + turf_layers = list(/turf/simulated/floor/outdoors/lavaland/ash) + var/last_act = 0 -/turf/simulated/floor/outdoors/lava_land/basalt - name = "basalt" - desc = "A hard cracked black rock formed from rapidly cooling lava." +// Stolen from mineral turf code. +/turf/simulated/floor/outdoors/lavaland/ashrock/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(!user.IsAdvancedToolUser()) + to_chat(user, "You don't have the dexterity to do this!") + return + + if(istype(W, /obj/item/weapon/pickaxe)) + if(!istype(user.loc, /turf)) + return + + var/obj/item/weapon/pickaxe/P = W + if(last_act + P.digspeed > world.time)//prevents message spam + return + last_act = world.time + + playsound(user, P.drill_sound, 20, 1) + to_chat(user, "You start [P.drill_verb].") + + if(do_after(user,P.digspeed)) + + to_chat(user, "You finish [P.drill_verb] \the [src].") + density = FALSE + opacity = FALSE + demote() // Converts the turf to the next layer in turf_layers. + ..() + +/decl/flooring/lavaland/ashrock + name = "ash covered stone" + desc = "Stone that's covered in a thin layer of ash." + icon_base = "ashrock" + icon = 'modular_chomp/icons/turf/lava_land.dmi' + +/turf/simulated/floor/outdoors/lavaland/basalt icon_state = "basalt0" edge_blending_priority = 3 - turf_layers = list(/turf/simulated/floor/outdoors/lava_land/ash) + initial_flooring = /decl/flooring/basalt + turf_layers = list(/turf/simulated/floor/outdoors/lavaland/ash) + +/turf/simulated/floor/outdoors/lavaland/basalt/get_edge_icon_state() + return "basalt0" +/decl/flooring/basalt + name = "basalt" + desc = "A hard cracked black rock formed from rapidly cooling lava." + icon = 'modular_chomp/icons/turf/lava_land.dmi' + icon_base = "basalt" + has_base_range = 12 + + // turf_layers = list(/turf/simulated/floor/outdoors/lava_land/ash) idk how these work diff --git a/modular_chomp/icons/turf/lava_land_edge.dmi b/modular_chomp/icons/turf/lava_land_edge.dmi index 913b5b2a17f952bb972bb53d47c2f0fbb4542a32..31784d21e2b6c2667522af6ed88801191136375c 100644 GIT binary patch delta 1268 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 Date: Sun, 26 Feb 2023 00:39:22 -0600 Subject: [PATCH 6/6] remove bad commented code --- .../turfs/simulated/outdoors/lava_land.dm | 77 +------------------ 1 file changed, 1 insertion(+), 76 deletions(-) diff --git a/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm b/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm index 49b20ba973..6c06c44c69 100644 --- a/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm +++ b/modular_chomp/code/game/turfs/simulated/outdoors/lava_land.dm @@ -1,13 +1,4 @@ -/* Testing -/turf/simulated/floor/outdoors/lava_land/sand - name = "sand" - desc = "Sandy, taste salty and gritty." - icon = 'modular_chomp/icons/turf/lava_land.dmi' - edge_blending_priority = 2 - turf_layers = list(/turf/simulated/floor/outdoors/rocks) - initial_flooring = /decl/flooring/sand - can_dig = false -*/ + /turf/simulated/floor/outdoors/lavaland icon = 'modular_chomp/icons/turf/lava_land.dmi' icon_edge = 'modular_chomp/icons/turf/lava_land_edge.dmi' @@ -77,69 +68,3 @@ icon = 'modular_chomp/icons/turf/lava_land.dmi' icon_base = "basalt" has_base_range = 12 - - - -// turf_layers = list(/turf/simulated/floor/outdoors/lava_land/ash) idk how these work - -/* Testing -/decl/flooring/outdoors/sand - name = "sand" - desc = "Salty and gritty." - icon = 'modular_chomp/icons/turf/lava_land.dmi' - icon_base = "sand" - footstep_sounds = list("human" = list( - 'sound/effects/footstep/asteroid1.ogg', - 'sound/effects/footstep/asteroid2.ogg', - 'sound/effects/footstep/asteroid3.ogg', - 'sound/effects/footstep/asteroid4.ogg', - 'sound/effects/footstep/asteroid5.ogg', - 'sound/effects/footstep/MedDirt1.ogg', - 'sound/effects/footstep/MedDirt2.ogg', - 'sound/effects/footstep/MedDirt3.ogg', - 'sound/effects/footstep/MedDirt4.ogg')) - -/turf/simulated/floor/outdoors/sand/Initialize(mapload) - var/possiblesands = list( - "ironsand1" = 50, - "ironsand2" = 1, - "ironsand3" = 1, - "ironsand4" = 1, - "ironsand5" = 1, - "ironsand6" = 1, - "ironsand7" = 1, - "ironsand8" = 1, - "ironsand9" = 1, - "ironsand10" = 1, - "ironsand11" = 1, - "ironsand12" = 1, - "ironsand13" = 1, - "ironsand14" = 1, - "ironsand15" = 1 - - ) - flooring_override = pickweight(possiblesands) - return ..() - -/turf/simulated/floor/water/hotspring - name = "Hotsprings" - desc = "A natural hotspring connecting to an aquifer. It seems the facility was built ontop of it." - edge_blending_priority = -2 - movement_cost = 8 - depth = 2 - water_state = "water_shallow" - outdoors = FALSE - -/turf/simulated/floor/water/hotspring/Entered(atom/movable/AM, atom/oldloc) - if(istype(AM, /mob/living)) - var/mob/living/L = AM - L.update_water() - if(L.check_submerged() <= 0) - return - if(!istype(oldloc, /turf/simulated/floor/water/hotspring)) - to_chat(L, "You feel an overwhelming wave of warmth from entering \the [src]!") - AM.water_act(5) - ..() - - -*/