diff --git a/baystation12.dme b/baystation12.dme index 236a89704bd..a75d1a6a9c3 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1,9 +1,8 @@ -// DM Environment file for tgstation.dme. -// All manual changes should be made outside the BEGIN_ and END_ blocks. - // New source code should be placed in .dm files: choose File/New --> Code File. +// DM Environment file for baystation12.dme. +// All manual changes should be made outside the BEGIN_ and END_ blocks. + // New source code should be placed in .dm files: choose File/New --> Code File. // BEGIN_INTERNALS // END_INTERNALS - // BEGIN_FILE_DIR #define FILE_DIR . #define FILE_DIR "code" @@ -51,6 +50,7 @@ #define FILE_DIR "sound/voice" #define FILE_DIR "sound/weapons" // END_FILE_DIR + // BEGIN_PREFERENCES // END_PREFERENCES @@ -295,6 +295,7 @@ #include "code\game\machinery\floodlight.dm" #include "code\game\machinery\Freezer.dm" #include "code\game\machinery\hologram.dm" +#include "code\game\machinery\holosign.dm" #include "code\game\machinery\hydroponics.dm" #include "code\game\machinery\igniter.dm" #include "code\game\machinery\iv_drip.dm" @@ -317,7 +318,6 @@ #include "code\game\machinery\spaceheater.dm" #include "code\game\machinery\status_display.dm" #include "code\game\machinery\suit_storage_unit.dm" -#include "code\game\machinery\holosign.dm" #include "code\game\machinery\syndicatebeacon.dm" #include "code\game\machinery\teleporter.dm" #include "code\game\machinery\transformer.dm" @@ -1154,6 +1154,7 @@ #include "code\WorkInProgress\Chinsky\ashtray.dm" #include "code\WorkInProgress\Ported\policetape.dm" #include "code\WorkInProgress\SkyMarshal\Ultralight_procs.dm" +#include "code\WorkInProgress\Susan\susan_desert_turfs.dm" #include "code\WorkInProgress\virus2\analyser.dm" #include "code\WorkInProgress\virus2\antibodies.dm" #include "code\WorkInProgress\virus2\base.dm" @@ -1174,5 +1175,6 @@ #include "interface\interface.dm" #include "interface\skin.dmf" #include "maps\tgstation.2.0.9.1.dmm" +#include "maps\RandomZLevels\Academy.dm" #include "maps\RandomZLevels\stationCollision.dm" // END_INCLUDE diff --git a/maps/RandomZLevels/Academy.dmm b/maps/RandomZLevels/Academy.dmm index efd308eb85a..3aa211a9b07 100644 --- a/maps/RandomZLevels/Academy.dmm +++ b/maps/RandomZLevels/Academy.dmm @@ -341,12 +341,12 @@ "gC" = (/obj/structure/table,/obj/item/weapon/gun/projectile/russian,/obj/item/weapon/paper{info = "Grade: B- Educator's Notes: Keep applying yourself, you're showing improvement."; name = "Summoning Midterm Exam"},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) "gD" = (/obj/structure/table,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) "gE" = (/obj/structure/window/reinforced,/obj/item/ammo_casing,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/awaymission/academy/classrooms) -"gF" = (/mob/living/simple_animal/bear,/turf/simulated/floor/plating,/area/awaymission/academy/classrooms) +"gF" = (/mob/living/simple_animal/hostile/bear,/turf/simulated/floor/plating,/area/awaymission/academy/classrooms) "gG" = (/obj/structure/bookcase,/obj/item/weapon/book/manual/hydroponics_pod_people,/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) "gH" = (/obj/structure/bookcase,/obj/item/weapon/book/manual/barman_recipes,/obj/item/weapon/book/manual/security_space_law,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) "gI" = (/obj/structure/stool,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) "gJ" = (/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/awaymission/academy/classrooms) -"gK" = (/obj/machinery/light/small{dir = 8},/mob/living/simple_animal/bear,/turf/simulated/floor/plating,/area/awaymission/academy/classrooms) +"gK" = (/obj/machinery/light/small{dir = 8},/mob/living/simple_animal/hostile/bear,/turf/simulated/floor/plating,/area/awaymission/academy/classrooms) "gL" = (/obj/structure/mineral_door/iron,/turf/simulated/floor/carpet,/area/awaymission/academy/classrooms) "gM" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/turf/simulated/floor/carpet,/area/awaymission/academy/academyaft) "gN" = (/obj/machinery/door/airlock/gold{locked = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/carpet,/area/awaymission/academy/classrooms) diff --git a/maps/RandomZLevels/assistantChamber.dmm b/maps/RandomZLevels/assistantChamber.dmm index dc5373e1c8f..150e7dd59de 100644 --- a/maps/RandomZLevels/assistantChamber.dmm +++ b/maps/RandomZLevels/assistantChamber.dmm @@ -10,7 +10,7 @@ "j" = (/obj/item/ammo_magazine,/turf/simulated/floor{icon_state = "white"},/area/awaymission) "k" = (/obj/effect/rune,/turf/simulated/floor{icon_state = "white"},/area/awaymission) "l" = (/obj/machinery/turret{dir = 8; lasers = 1; name = "Angry Turret"},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "white"},/area/awaymission) -"m" = (/obj/item/weapon/mousetrap/armed,/turf/simulated/floor{icon_state = "white"},/area/awaymission) +"m" = (/obj/item/device/assembly/mousetrap/armed,/turf/simulated/floor{icon_state = "white"},/area/awaymission) "n" = (/obj/item/weapon/nullrod,/turf/simulated/floor{icon_state = "white"},/area/awaymission) "o" = (/obj/item/weapon/card/id/captains_spare,/turf/simulated/floor{icon_state = "white"},/area/awaymission) "p" = (/obj/item/weapon/gun/energy/pulse_rifle/M1911,/turf/simulated/floor{icon_state = "white"},/area/awaymission) diff --git a/maps/RandomZLevels/example.dmm b/maps/RandomZLevels/example.dmm index 62a8cacec12..18e6eb0dc60 100644 --- a/maps/RandomZLevels/example.dmm +++ b/maps/RandomZLevels/example.dmm @@ -119,7 +119,7 @@ "co" = (/obj/structure/noticeboard{pixel_y = 32},/obj/item/weapon/paper{info = "Remember, friday is David Bowie night! You guys had better fucking be there!"; name = "friday night"},/obj/item/weapon/cigbutt,/turf/simulated/floor{icon_state = "yellowcorner"},/area/awaymission/example) "cp" = (/obj/item/trash/pistachios,/turf/simulated/floor,/area/awaymission/example) "cq" = (/obj/effect/landmark{name = "awaystart"},/turf/simulated/floor,/area/awaymission/example) -"cr" = (/obj/effect/landmark{name = "awaystart"},/obj/item/weapon/mousetrap/armed,/turf/simulated/floor,/area/awaymission/example) +"cr" = (/obj/effect/landmark{name = "awaystart"},/obj/item/device/assembly/mousetrap/armed,/turf/simulated/floor,/area/awaymission/example) "cs" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/awaymission/example) "ct" = (/obj/effect/landmark{name = "awaystart"},/obj/machinery/light_construct/small{tag = "icon-bulb-construct-stage1 (WEST)"; icon_state = "bulb-construct-stage1"; dir = 8},/turf/simulated/floor,/area/awaymission/example) "cu" = (/obj/effect/landmark{name = "awaystart"},/obj/item/weapon/mop,/turf/simulated/floor,/area/awaymission/example)