diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 53bc3b71ad..3ffe65d82b 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -2527,7 +2527,7 @@ desc = "Food made by dogs!" product_ads = "EAT FOOD!!!;Awooooooooooooooo!~;Made by actual dogs!;Now with twenty percent more taste!!!" icon = 'icons/obj/vending.dmi' - icon_state = "fridge_food" + icon_state = "hotfood" products = list(/obj/item/weapon/tray = 50, /obj/item/weapon/material/kitchen/utensil/fork = 50, /obj/item/weapon/material/knife/plastic = 50, @@ -3015,7 +3015,7 @@ desc = "Food made by dogs!" product_ads = "EAT FOOD!!!;Awooooooooooooooo!~;Made by actual dogs!;Now with twenty percent more taste!!!" icon = 'icons/obj/vending.dmi' - icon_state = "fridge_food" + icon_state = "hotfood" products = list(/obj/item/weapon/tray = 50, /obj/item/weapon/material/kitchen/utensil/fork = 50, /obj/item/weapon/material/knife/plastic = 50, @@ -3411,7 +3411,7 @@ desc = "Food made by dogs!" product_ads = "EAT FOOD!!!;Awooooooooooooooo!~;Made by actual dogs!;Now with twenty percent more taste!!!" icon = 'icons/obj/vending.dmi' - icon_state = "fridge_food" + icon_state = "hotfood" products = list(/obj/item/weapon/reagent_containers/food/snacks/bearmeat = 10, /obj/item/weapon/reagent_containers/food/snacks/carpmeat = 10, /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish = 10, diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index d103e93502..c307b229ec 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -2130,7 +2130,9 @@ /area/groundbase/cargo/office) "go" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/light/small/fairylights, +/obj/machinery/light/small/fairylights{ + pixel_y = -2 + }, /turf/simulated/floor/outdoors/sidewalk/virgo3c, /area/groundbase/level2/nw) "gq" = ( @@ -4925,6 +4927,12 @@ outdoors = 0 }, /area/groundbase/level2/se) +"oG" = ( +/obj/machinery/light/small/fairylights{ + pixel_y = -1 + }, +/turf/simulated/floor/outdoors/grass/virgo3c, +/area/groundbase/level2/nw) "oH" = ( /turf/simulated/open/virgo3c, /area/groundbase/level2/eastspur) @@ -7398,8 +7406,19 @@ /obj/machinery/light_switch{ pixel_y = 30 }, +<<<<<<< HEAD /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/chapel) +======= +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room1) +"wl" = ( +/obj/machinery/light/small/fairylights{ + pixel_y = -1 + }, +/turf/simulated/floor/outdoors/newdirt/virgo3c, +/area/groundbase/level2/nw) +>>>>>>> 3c288de197... Merge pull request #13353 from Very-Soft/backtogb "wm" = ( /obj/machinery/computer/supplycomp/control{ dir = 8 @@ -11169,7 +11188,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/machinery/light/small/fairylights, +/obj/machinery/light/small/fairylights{ + pixel_y = -2 + }, /turf/simulated/floor/outdoors/sidewalk/virgo3c, /area/groundbase/level2/nw) "Hs" = ( @@ -23866,13 +23887,13 @@ bY bY bY bY -EZ +wl ml pw -lM +oG bY bY -lM +oG bY bY bY @@ -24150,13 +24171,13 @@ bY bY bY bY -EZ +wl sN pw -lM +oG bY Oa -lM +oG bY bY bY diff --git a/maps/groundbase/groundbase_poi_stuff.dm b/maps/groundbase/groundbase_poi_stuff.dm index 60b200939c..8095e4d71f 100644 --- a/maps/groundbase/groundbase_poi_stuff.dm +++ b/maps/groundbase/groundbase_poi_stuff.dm @@ -1060,7 +1060,11 @@ name = "wide building 6" mappath = 'southwilds/villagepois/wide6.dmm' /area/submap/groundbase/poi/wildvillage/wide/wide6 - +/obj/item/weapon/paper/wide6 + name = "\improper hand written letter" + info = {"It is hard for me to write this out, and I hope you will be back soon, but I fear that by the time you return I will already be gone. I will try my best to hold on, but even as I write this, I can feel myself slipping.

+ I know that you all do not believe me but I really can see them, just beyond the walls, and they're even closer now than they were before. I can see them even when I close my eyes. Seven golden eyes watch me, and I can feel their heat pouring into me. As they come closer, I can feel myself being tugged in. Like I'm a little lost moon being tugged into the embrace of a passing star.

It still doesn't hurt. It's getting hard to see anything else, and I can't move anymore. I feel like everything is going to be okay. If you see seven eyes, don't be afraid. Just promise you'll come find me, okay?

+ I'll keep hol"} /datum/map_template/groundbase/wildvillage/long/long1 name = "long building 1" diff --git a/maps/groundbase/southwilds/villagepois/wide6.dmm b/maps/groundbase/southwilds/villagepois/wide6.dmm index 90f8197b9c..78b99a7beb 100644 --- a/maps/groundbase/southwilds/villagepois/wide6.dmm +++ b/maps/groundbase/southwilds/villagepois/wide6.dmm @@ -53,10 +53,7 @@ /obj/item/weapon/bedsheet/double, /obj/random/plushie, /obj/structure/curtain/open/privacy, -/obj/item/weapon/paper{ - info = "It is hard for me to write this out, and I hope you will be back soon, but I fear that by the time you return I will already be gone. I will try my best to hold on, but even as I write this, I can feel myself slipping.

I know that you all do not believe me but I really can see them, just beyond the walls, and they're even closer now than they were before. I can see them even when I close my eyes. Seven golden eyes watch me, and I can feel their heat pouring into me. As they come closer, I can feel myself being tugged in. Like I'm a little lost moon being tugged into the embrace of a passing star.

It still doesn't hurt. It's getting hard to see anything else, and I can't move anymore. I feel like everything is going to be okay. If you see seven eyes, don't be afraid. Just promise you'll come find me, okay?

I'll keep hol"; - name = "A hand written letter" - }, +/obj/item/weapon/paper/wide6, /turf/simulated/floor/tiled/white, /area/submap/groundbase/poi/wildvillage/wide/wide6) "n" = (