From 81937179ec001bdee63fce3fc940b0e29eb356e2 Mon Sep 17 00:00:00 2001 From: Cyantime Date: Tue, 9 Jan 2018 18:06:03 -0500 Subject: [PATCH 1/2] Fix snakesnack box --- .../mob/living/simple_animal/animals/snake_vr.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/snake_vr.dm b/code/modules/mob/living/simple_animal/animals/snake_vr.dm index ac75d0e573..64a485abfd 100644 --- a/code/modules/mob/living/simple_animal/animals/snake_vr.dm +++ b/code/modules/mob/living/simple_animal/animals/snake_vr.dm @@ -94,11 +94,11 @@ storage_slots = 7 /obj/item/weapon/storage/box/fluff/snakesnackbox/New() - new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) - new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) - new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) - new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) - new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) - new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) - new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) - ..() + new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) + new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) + new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) + new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) + new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) + new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) + new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) + ..() From be875510f3bab2046a202c6c6fd1949d00bdd321 Mon Sep 17 00:00:00 2001 From: Cyantime Date: Tue, 9 Jan 2018 18:51:14 -0500 Subject: [PATCH 2/2] Actually fixes snakesnack box --- code/modules/mob/living/simple_animal/animals/snake_vr.dm | 4 ++-- maps/tether/tether-03-station.dmm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/snake_vr.dm b/code/modules/mob/living/simple_animal/animals/snake_vr.dm index 64a485abfd..9068ec7f67 100644 --- a/code/modules/mob/living/simple_animal/animals/snake_vr.dm +++ b/code/modules/mob/living/simple_animal/animals/snake_vr.dm @@ -86,14 +86,14 @@ desc = "A little mouse treat made of coloured sugar. Noodle loves these! This one is [snack_colour]." reagents.add_reagent("sugar", 2) -/obj/item/weapon/storage/box/fluff/snakesnackbox +/obj/item/weapon/storage/box/snakesnackbox name = "box of Snake Snax" desc = "A box containing Noodle's special sugermouse treats." icon = 'icons/mob/snake_vr.dmi' icon_state = "sneksnakbox" storage_slots = 7 -/obj/item/weapon/storage/box/fluff/snakesnackbox/New() +/obj/item/weapon/storage/box/snakesnackbox/New() new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) diff --git a/maps/tether/tether-03-station.dmm b/maps/tether/tether-03-station.dmm index 0700ca993e..ad6becb59d 100644 --- a/maps/tether/tether-03-station.dmm +++ b/maps/tether/tether-03-station.dmm @@ -2708,7 +2708,7 @@ "baC" = (/obj/machinery/requests_console{department = "Tech storage"; pixel_x = -28; pixel_y = 0},/obj/machinery/camera/network/engineering{dir = 4},/turf/simulated/floor,/area/storage/tech) "baD" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/carpet/oracarpet,/area/crew_quarters/heads/chief) "baE" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/camera/network/engineering{dir = 8},/turf/simulated/floor/tiled/dark,/area/storage/tech) -"baF" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 28},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/table/reinforced,/obj/item/weapon/storage/box/fluff/snakesnackbox,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) +"baF" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 28},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/table/reinforced,/obj/item/weapon/storage/box/snakesnackbox,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "baG" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) "baH" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/powermonitor{pixel_x = 0; pixel_y = 3},/obj/item/weapon/circuitboard/stationalert_engineering{pixel_x = 2; pixel_y = 1},/obj/item/weapon/circuitboard/security/engineering{pixel_x = 5; pixel_y = -1},/obj/item/weapon/circuitboard/atmos_alert{pixel_x = 6; pixel_y = -3},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/storage/tech) "baI" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -28},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/computer/security/engineering{dir = 4},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)