diff --git a/GainStation13/code/modules/food_and_drinks/bigbottle.dm b/GainStation13/code/modules/food_and_drinks/bigbottle.dm index a04875e20e..6ab4ce01f7 100644 --- a/GainStation13/code/modules/food_and_drinks/bigbottle.dm +++ b/GainStation13/code/modules/food_and_drinks/bigbottle.dm @@ -46,7 +46,6 @@ cut_overlays() var/mutable_appearance/reagent_overlay = mutable_appearance(icon, "reagent") if(reagents.reagent_list.len) - var/datum/reagent/R = reagents.get_master_reagent() /*if(!renamedByPlayer) name = "bottle of " + R.name desc = R.glass_desc*/ diff --git a/GainStation13/icons/obj/device.dmi b/GainStation13/icons/obj/device.dmi index b4a7291677..6b6d86e248 100644 Binary files a/GainStation13/icons/obj/device.dmi and b/GainStation13/icons/obj/device.dmi differ diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index c5231c015a..ce834d885a 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -528,7 +528,7 @@ "km" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/security) "kn" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/security) "ko" = (/obj/structure/window{dir = 1; icon_state = "window"},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) -"kp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/window{dir = 1; icon_state = "window"},/obj/structure/chair/comfy/blue{dir = 8},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) +"kp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/window{dir = 1; icon_state = "window"},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "kq" = (/obj/machinery/suit_storage_unit/standard_unit,/obj/structure/cable{icon_state = "1-4"},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) "kr" = (/obj/machinery/power/smes/engineering,/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "0-8"},/obj/structure/sign/warning/electricshock{pixel_y = -32},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) "ks" = (/obj/machinery/power/smes/engineering,/obj/structure/cable{icon_state = "0-8"},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) @@ -683,7 +683,6 @@ "no" = (/obj/machinery/door/airlock{dir = 4; name = "Men's Changing"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/obj/structure/curtain,/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/pool) "np" = (/obj/structure/table,/obj/item/reagent_containers/rag/towel{pixel_x = 4; pixel_y = 4},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/pool) "nq" = (/obj/structure/table,/obj/item/card/id/away/hotel/securty,/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/security) -"nr" = (/obj/structure/window,/obj/structure/chair/comfy/blue{dir = 4},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "ns" = (/obj/machinery/door/airlock{dir = 4; name = "Women's Changing"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/obj/structure/curtain,/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/pool) "nt" = (/obj/machinery/door/airlock{dir = 4; name = "Custodial Closet"; req_access_txt = "200,201"},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/custodial) "nu" = (/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/dock) @@ -715,7 +714,7 @@ "pD" = (/obj/effect/turf_decal/tile/purple,/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "pV" = (/obj/structure/mirror{pixel_y = 32},/obj/structure/sink{pixel_y = 24},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 4},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_6) "qs" = (/obj/machinery/vending/autodrobe/all_access,/turf/open/floor/wood,/area/ruin/space/has_grav/hotel/dock) -"qC" = (/obj/machinery/vending/clothing{credits = 50},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) +"qC" = (/obj/machinery/vending/clothing,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "qW" = (/obj/structure/flora/ausbushes/grassybush,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool) "rd" = (/turf/open/floor/plasteel/white/side{dir = 5},/area/ruin/space/has_grav/hotel/pool) "rs" = (/obj/machinery/light{dir = 1; pixel_y = 16},/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/ppflowers,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool) @@ -767,13 +766,11 @@ "EG" = (/obj/structure/window{dir = 1; icon_state = "window"},/obj/machinery/vending/mealdor,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "EY" = (/obj/structure/toilet{dir = 4},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_6) "Fh" = (/obj/machinery/pool/controller,/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/yellowsiding,/area/ruin/space/has_grav/hotel/pool) -"FH" = (/obj/structure/window,/obj/structure/chair/comfy/blue{dir = 8},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "Gg" = (/obj/machinery/deepfryer,/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) "Gj" = (/obj/effect/overlay/palmtree_l,/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/ywflowers,/obj/machinery/light,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool) "Gk" = (/obj/structure/window{dir = 1; icon_state = "window"},/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "Gz" = (/obj/machinery/door/window/eastleft{dir = 1},/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_6) "GA" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/pool) -"GG" = (/obj/structure/window{dir = 1; icon_state = "window"},/obj/structure/chair/comfy/blue{dir = 4},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "HU" = (/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/ppflowers,/obj/machinery/light,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool) "IF" = (/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "IN" = (/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/pool) @@ -880,7 +877,7 @@ aaaaaaaaabaaajiriHiIiJiJiKiLircQfifihIfifihUfifififififififiamamamamamamameTmWeT aaaaaaaaabaaajiriRiIiSiSiKiTirhPcJiUiVcJcJiWcJcJcJcJcJhQcJcJcJcJiYiZcJcJnLjamZjanajcjdeGjeeWgKNrgyeWzwjfgKNrgyjheGgfaaaaababaaaaaaaaaa aaaaaaaaabaaajirjijjjkjliKjmjnjojojpjqjojojrjGjojojpnbhfjtjtjtjtjtjtjtjtjtjtncjvndjxjtjtjtjtjtjtjyjtjtfreGeGeGeGeGgfaaabaaaaaaaaaaaaaa aaaaaaaaabaaajirjAjBiKjCjDjEjFjGjHjIjJjKjLjGjMjNjOjPckcQjQnvwsVXUcAhjTrsnvnfDrqCngDrjZneAhUcVXBfkanvjQgWgAgAhwjQaaaaaaabaaaaaaaaaaaaaa -aaaaaaaaabacajkbkckdkekfiKiKkgjGkhkikjkkklkmknknknjPbLcQjQEGyfWHGkkokokokokUkUkUnkkUkokokokoGGwekpyBjQkFluluXPjQaaaaaaabaaaaaaaaaaaaaa +aaaaaaaaabacajkbkckdkekfiKiKkgjGkhkikjkkklkmknknknjPbLcQjQEGyfWHGkkokokokokUkUkUnkkUkokokokokowekpyBjQkFluluXPjQaaaaaaabaaaaaaaaaaaaaa aaaaaaaaabaaajirkqkrksktkukvkwjGkxkykzkAklkBknknkCjPawcQjQMykUkUlPnhnhnhnhnhnhnhninhnhnhnhnhrdkUkGnnMFlululuINjQaaaaaaabaaaaaaaaaaaaaa aaaaaaaaabaaajirkHkHkHkIkHkHkJjGkKkkkLkMkNkmkOkPknjPawcQjQMynzlPYxnynynynyAonyFhkRpikSkSkSkSONVlnAsxjQjQjQjQjQjQacacacabaaaaaaaaaaaaaa aaaaaaaaabaaajirkVkWkXkYkZkHlajGlbkklcldkljGlelflgjPawcQjQbMjbfbZSLKljNnNnAMNnNnNnAMNnNnNnliKiVNjbnnjQlmlnlnlojQaaaaaaabaaaaaaaaaaaaaa @@ -894,7 +891,7 @@ abaclVlWlWlWlWlXlYlYlYlYlZacacjGjGjGjGjGjGjGjGjGjGjPcQmajQMynzlhZSUtIFIFIFIFIFnO abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmemfmgmhmimjmkmlmmcQckjQbMjbfbZSzQtetetenmtetetenmteteteltKiVNjRnnnslHlHlHlHjQaaaaabaaaaaaaaaaaaaaaa abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmlmlmlmlmompmpmpmqhfcvjtmrnzwBEknjnjnjnjIQnjnjnjIQnjnjnjnjsonxkUnnjQmsOcOcmtjQaaaaabaaaaaaaaaaaaaaaa abaclVlWlWlWlWlXlYlYlYlYlZacacacmdmlmlmlmumvmvmvmwntmymznMmBkTkUwBjSjSjSjSjSjSjSjSjSjSjSjSjSnxkUkULEjQlmlululojQacacabaaaaaaaaaaaaaaaa -abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmlmEmFmGmHmImlmJmdawedjQSOkQnrVhFHkQkUkUkUkQkQkQkUkUkUkQnrVhFHkQUqjQlmlululojQaaaaabaaaaaaaaaaaaaaaa +abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmlmEmFmGmHmImlmJmdawedjQSOkQkQVhkQkQkUkUkUkQkQkQkUkUkUkQkQVhkQkQUqjQlmlululojQaaaaabaaaaaaaaaaaaaaaa abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmdmdmdmdmdmdmdmdmdawfgjQnvxXvrHUxAnvPEfLoJnvGjnvoJmLDwnvnwhXqWBfnvjQlmlululojQaaaaabaaaaaaaaaaaaaaaa abaclVlWlWlWlWlXlYlYlYlYlZacacacacacaaaaaaaaacaaaaamamamjQjQjQmNmNmNmNjQjQmNmNmNmNmNjQjQmNmNmNmNjQjQjQjQjQjQjQjQaaaaabaaaaaaaaaaaaaaaa abaaaaaaaaaaaaajaaaaaaaaaaaaaaaaaaacaaaaaaaaacaaaaaaaaaaaaaaacaaaaaaaaaaacaaaaaaaaaaacaaaaaaaaaaacaaaaaaaaaaaaacaaaaabaaaaaaaaaaaaaaaa