From 6472b7c05824c6557189a544ec8fe9dc67beed52 Mon Sep 17 00:00:00 2001 From: Pinta <124479862+deertools@users.noreply.github.com> Date: Sun, 5 Feb 2023 20:13:25 -0500 Subject: [PATCH 1/2] wew --- _maps/RandomRuins/SpaceRuins/fastfood.dmm | 8 +++--- .../items/stacks/tiles/tile_mineral.dm | 8 +++--- .../turfs/simulated/floor/mineral_floor.dm | 28 ++++++------------- 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/fastfood.dmm b/_maps/RandomRuins/SpaceRuins/fastfood.dmm index 29985496..e2d683f6 100644 --- a/_maps/RandomRuins/SpaceRuins/fastfood.dmm +++ b/_maps/RandomRuins/SpaceRuins/fastfood.dmm @@ -110,7 +110,7 @@ "lL" = (/obj/machinery/light/small{dir = 8},/obj/structure/janitorialcart,/obj/item/mop/advanced,/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) "lM" = (/obj/effect/turf_decal/loading_area{dir = 6; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_panel"; name = "steel pannel"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) "lO" = (/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) -"lP" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/mineral/calorite_hide,/area/ruin/space/has_grav/hotel/bar) +"lP" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/mineral/calorite/hide,/area/ruin/space/has_grav/hotel/bar) "mb" = (/obj/machinery/vending/coffee,/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) "mj" = (/obj/machinery/atmospherics/pipe/manifold/supply{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/bar) "mx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) @@ -161,7 +161,7 @@ "tK" = (/obj/structure/lattice/catwalk,/turf/open/space/basic,/area/ruin/space/has_grav/hotel/bar) "tQ" = (/obj/structure/table/reinforced,/obj/machinery/door/poddoor/shutters/old/preopen{id = "fastfood_kitchen"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) "tX" = (/obj/machinery/vending/mealdor,/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) -"tZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 8},/turf/open/floor/mineral/calorite_hide,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) +"tZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 8},/turf/open/floor/mineral/calorite/hide,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) "uc" = (/obj/machinery/icecream_vat,/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) "ud" = (/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_panel"; name = "steel pannel"},/obj/structure/disposalpipe/segment,/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) "uj" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/structure/sign/poster/contraband/pwr_game{pixel_x = 32},/obj/machinery/light/small{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/bar{name = "Restaurant Main Area"}) @@ -171,7 +171,7 @@ "uv" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/bar) "uw" = (/turf/closed/wall,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) "uy" = (/obj/structure/table/wood,/obj/item/storage/backpack/cheeseburgerbackpack,/turf/open/floor/carpet/gato,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) -"uB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/mineral/calorite_hide,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) +"uB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/mineral/calorite/hide,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) "uC" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/bar) "uS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) "vc" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/bar) @@ -301,7 +301,7 @@ "KT" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/bar) "Lc" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/bar) "Ld" = (/obj/structure/window/fulltile,/obj/structure/flora/ausbushes/grassybush,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/bar) -"Lf" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/mineral/calorite_hide,/area/ruin/space/has_grav/hotel/bar) +"Lf" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/mineral/calorite/hide,/area/ruin/space/has_grav/hotel/bar) "Lg" = (/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/bar) "Lk" = (/obj/structure/table/reinforced,/obj/machinery/door/poddoor/shutters/old/preopen{id = "fastfood_kitchen"},/obj/item/reagent_containers/food/snacks/cubannachos,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) "Ln" = (/obj/structure/rack/shelf,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/custodial{name = "Restaurant Employee Area"}) diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm index 4c66cbc1..37a69af5 100644 --- a/code/game/objects/items/stacks/tiles/tile_mineral.dm +++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm @@ -61,20 +61,20 @@ mineralType = "calorite" materials = list(MAT_CALORITE=500) -/obj/item/stack/tile/mineral/calorite_hide //GS13 - disguised variant +/obj/item/stack/tile/mineral/calorite/hide //GS13 - disguised variant name = "Floor tile" singular_name = "calorite floor tile" desc = "A tile totally made out of steel." icon_state = "tile_calorite_hide" - turf_type = /turf/open/floor/mineral/calorite_hide + turf_type = /turf/open/floor/mineral/calorite/hide -/obj/item/stack/tile/mineral/calorite_strong //GS13 - strong variant +/obj/item/stack/tile/mineral/calorite/strong //GS13 - strong variant name = "Infused calorite tile" singular_name = "Infused calorite floor tile" desc = "A tile made out of stronger variant of calorite. Bwuurp." icon_state = "tile_calorite_strong" - turf_type = /turf/open/floor/mineral/calorite_strong + turf_type = /turf/open/floor/mineral/calorite/strong /obj/item/stack/tile/mineral/abductor diff --git a/code/game/turfs/simulated/floor/mineral_floor.dm b/code/game/turfs/simulated/floor/mineral_floor.dm index fd25bb60..5e2844a2 100644 --- a/code/game/turfs/simulated/floor/mineral_floor.dm +++ b/code/game/turfs/simulated/floor/mineral_floor.dm @@ -214,41 +214,31 @@ icons = list("calorite","calorite_dam") var/last_event = 0 var/active = null + ///How much fatness is added to the user upon crossing? + var/fat_to_add = 50 /turf/open/floor/mineral/calorite/Entered(mob/living/carbon/M) - if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE)) - return + if(!istype(M, /mob/living/carbon) || HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE)) + return FALSE else - M.fatness = M.fatness + 50 + M.fatness = M.fatness + fat_to_add // calorite floor, disguised version - GS13 -/turf/open/floor/mineral/calorite_hide +/turf/open/floor/mineral/calorite/hide name = "Steel floor" icon_state = "calorite_hide" - floor_tile = /obj/item/stack/tile/mineral/calorite_hide + floor_tile = /obj/item/stack/tile/mineral/calorite/hide icons = list("calorite_hide","calorite_hide_dam") -/turf/open/floor/mineral/calorite_hide/Entered(mob/living/carbon/M) - if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE)) - return - else - M.fatness = M.fatness + 50 - // calorite floor, powerful version - GS13 -/turf/open/floor/mineral/calorite_strong +/turf/open/floor/mineral/calorite/strong name = "Infused calorite floor" icon_state = "calorite_strong" - floor_tile = /obj/item/stack/tile/mineral/calorite_strong + floor_tile = /obj/item/stack/tile/mineral/calorite/strong icons = list("calorite_strong","calorite_strong_dam") -/turf/open/floor/mineral/calorite_strong/Entered(mob/living/carbon/M) - if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE)) - return - else - M.fatness = M.fatness + 50 - //DIAMOND /turf/open/floor/mineral/diamond From 2c50b4acbce6e5a0fdba4f79f7db10d975182deb Mon Sep 17 00:00:00 2001 From: Pinta <124479862+deertools@users.noreply.github.com> Date: Sun, 5 Feb 2023 20:35:07 -0500 Subject: [PATCH 2/2] tile obj sprites --- .../items/stacks/tiles/tile_mineral.dm | 3 +-- icons/obj/tiles.dmi | Bin 21014 -> 21524 bytes 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm index 37a69af5..a88443ca 100644 --- a/code/game/objects/items/stacks/tiles/tile_mineral.dm +++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm @@ -65,10 +65,9 @@ name = "Floor tile" singular_name = "calorite floor tile" desc = "A tile totally made out of steel." - icon_state = "tile_calorite_hide" + icon_state = "tile" turf_type = /turf/open/floor/mineral/calorite/hide - /obj/item/stack/tile/mineral/calorite/strong //GS13 - strong variant name = "Infused calorite tile" singular_name = "Infused calorite floor tile" diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index 59e8fdec01e7bf2877b595d2b0bfc2046815837a..a9f0ff7109e3737015243d01553fea38054b5e34 100644 GIT binary patch delta 1261 zcmV)HKy{ds(MFK@@;BdTR7 z?%=+E`aJBm99nV*_wDPjOEJ%>U0_S#^2lr)v*qxM?czwP@CmkWK zWsc*lWQL(9%6h^1y(g`)VeBRnFc+1{7Q)z7spNIRV9Wdw6=NqV9V>@SixhBwMT~RB zs%EiftQ7l+*JzbI7z+%Ynasv5E4V6%RX7V00_hosInN0T6rxn-K38?s z3MTO;(TIiY&dY@u@7X`H&MHq#{@m+uks>~+Ea)NDGrxb}@e-NAjNLWx_V0=<<<=?b zh`?O~A2fdn9;$$Fc%TZx;gL!RhpuW=CTlS=Mt2y(e?C58QAG_{k`29xoHWK?D16S% zC-AHqXU)q6G%QS*g}o&TvVli`|6pTQ_6IoAVv>ZWz1HODHWqyN9X`^ilkh{6E=Ws^#XMd|=e zK&80=3pTw8w_xQH_z;{bQbHx9tP@8#gzzUyqe$t7E}XH)X7Gayu1)p*Hi3C#nML#o z&phlm;Aj2I#`@*cyHyDFdcD=xjC;p;x882F7Sd`xrT+n>MXRM7o#8ojSo!`B{0@Ftxod`xqYe2@iE=`er< z>RXL+f9y07efRL!1M1jm;?E-ZIL`j52Nf584hh2ur|;6r_#XLvV{#?@c_QcUfF z5tW@7K!NaoeEIagug_w%6do@d1o>X}4E#p8oAv9rHd=uSm#CgtaE|M?yh$hA&AQP? zPuA-R^}U>%C~sl_Nqs(2pO7u7&qwMLvX$=f0g`<_Qr%X%#|KFE`ABu5GUFwfAid2F ze5~3WS@_zUccx9S3~vzQR#6JT43q}(#K8pxDUvlsSijWH`Un( zM2CU_w1aK>eEwA*&?el9r$fR3+JPP}(l&e^^l*{3;fW3b14v*Bn0OmL+@>GhK5li~ zXP5#ey$wISn{Ra-QQ2@2T9EGZN$+qCWBdmCm>TEovkz#~ui?E(2OdVoIYecbc{>h( z_X8^Wemr@fpSRHo@3w(}YxZmHj=Q%UMP`M2U{WmWO<>z6;sUEL&7 zUU1*OR<10XPj_eY?{B3ymd<#7CC~oa3fJ-if8F95sWQdYKnbHa_2<02_tf5BxVcZ@ zy3z5%Fr&j4j8peM`g3pcwHpRy!kja@Po;1tzF8IWX;;FA)Vltzjlxs=COa>4<*L}P zbZlo*;N}Qpv97;IvbT82>2UMRoq6V%u6Bi1N9YbQ6_!ifJjL^b!zLsv?2U+uc9zaO zB%LY7rf>0cP2JfA&v$lT)2pgiQf8a|^V*N!ohKLXbj*#Ixc2gqF4Ygt57vk5V%dD` z#&UtBM&Ea?S{=4Q$X-QiqtforMXJY&zxA&%J|#SP{}-#6B^~}++*U`betqY+iBmR? zNG|8C`MW#GduOSamDhuHjqGRRo7$BWWaK)U3My2D4lUG{ntC#-r{|(<+lS-F)q_{9 zVD#R!u=_-0@}Jg2)9=(UrC+tkj$5}NG4YVj8{NPOyfP1`o_uh$z+Qi~s;J|2Tdjk$ zL=3LReNGCp64@^Pd4E&-_fKUdpkSA_oVME9>vY?@%}h*E4ov)?Hp@93;p5#uJ92wo z?9%y6%^%gdC%+GHujh=uwj|L&;;G_t2HVohR+nZaPrZ2Y|NVQiiw!uM6D9nXpOf8H zG2z~k-&WNVbolaEmw#hYm0VM!blzC{(HEx&>Xp+!Ro$EY`nyYp%<=P!3)SE4T9+!( z_N+><>2nbaa}ozAno8eE#WcQT%u1E&R+K z)>_W5yy=zim$ClZ9RIajzdUPcz-q)!-^*A2Jb3k;u~M9;XcyxyE5;@ncLO9lAQsNh Y-@57V-c)V5QU)OKboFyt=akR{0H*j{x&QzG