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..a88443ca 100644 --- a/code/game/objects/items/stacks/tiles/tile_mineral.dm +++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm @@ -61,20 +61,19 @@ 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 + icon_state = "tile" + 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 diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index 59e8fdec..a9f0ff71 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ