From 3485fb1204096e81602243d1289a184bc251ba7a Mon Sep 17 00:00:00 2001 From: "Mr. Moriarty" Date: Tue, 21 Jun 2022 16:56:57 +0100 Subject: [PATCH 1/5] Added a shady office, one that is definitely not used for organised crime. --- assets/maps/random_rooms/5x3/shadyoffice.dmm | 127 +++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 assets/maps/random_rooms/5x3/shadyoffice.dmm diff --git a/assets/maps/random_rooms/5x3/shadyoffice.dmm b/assets/maps/random_rooms/5x3/shadyoffice.dmm new file mode 100644 index 0000000000000..c8f3fd42034d7 --- /dev/null +++ b/assets/maps/random_rooms/5x3/shadyoffice.dmm @@ -0,0 +1,127 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/table/wood/round, +/obj/item/reagent_containers/food/drinks/bottle/empty/rectangular{ + pixel_x = -3; + pixel_y = 16 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/shot{ + pixel_x = 6; + pixel_y = 12 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/shot{ + pixel_x = 1; + pixel_y = 6 + }, +/turf/simulated/floor/wood/two, +/area/dmm_suite/clear_area) +"d" = ( +/obj/stool/chair/wooden{ + dir = 1 + }, +/turf/simulated/floor/wood/two, +/area/dmm_suite/clear_area) +"g" = ( +/obj/decal/poster/wallsign/dead_exec_portrait, +/turf/simulated/floor/wood/two, +/area/dmm_suite/clear_area) +"h" = ( +/obj/decal/fakeobjects/bookcase{ + dir = 1; + pixel_y = 22 + }, +/obj/item/storage/secure/sbriefcase{ + pixel_x = -6; + pixel_y = 7 + }, +/turf/simulated/floor/wood/two, +/area/dmm_suite/clear_area) +"j" = ( +/obj/item/cigarbox{ + pixel_x = 4; + pixel_y = -1 + }, +/turf/simulated/floor/wood/two, +/area/dmm_suite/clear_area) +"t" = ( +/obj/table/wood/auto/desk{ + pixel_x = 13 + }, +/obj/table/wood/auto/desk{ + pixel_x = -13 + }, +/obj/machinery/phone/unlisted{ + pixel_x = 19; + pixel_y = 6 + }, +/obj/item/paper{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/item/pen/fancy{ + pixel_x = -12; + pixel_y = 9 + }, +/obj/machinery/light/lamp/green{ + pixel_x = -18; + pixel_y = 7 + }, +/turf/simulated/floor/wood/two, +/area/dmm_suite/clear_area) +"v" = ( +/obj/decoration/clock{ + pixel_y = 32 + }, +/turf/simulated/floor/wood/two, +/area/dmm_suite/clear_area) +"E" = ( +/obj/stool/chair/comfy/red, +/turf/simulated/floor/wood/two, +/area/dmm_suite/clear_area) +"S" = ( +/obj/decal/fakeobjects/bookcase{ + pixel_y = 22 + }, +/obj/shrub{ + icon = 'icons/obj/stationobjs.dmi'; + icon_state = "plant"; + pixel_x = 9; + pixel_y = -5 + }, +/obj/decoration/regallamp{ + anchored = 1; + lit = 1; + pixel_x = -8; + pixel_y = 8 + }, +/turf/simulated/floor/wood/two, +/area/dmm_suite/clear_area) +"Y" = ( +/turf/simulated/floor/wood/two, +/area/dmm_suite/clear_area) + +(1,1,1) = {" +h +Y +a +"} +(2,1,1) = {" +g +Y +Y +"} +(3,1,1) = {" +E +t +d +"} +(4,1,1) = {" +v +Y +Y +"} +(5,1,1) = {" +S +Y +j +"} From a01dbbbdb3bbb319f1a23e9298a4ae250922326e Mon Sep 17 00:00:00 2001 From: "Mr. Moriarty" Date: Tue, 21 Jun 2022 17:14:21 +0100 Subject: [PATCH 2/5] Office updates. --- assets/maps/random_rooms/5x3/shadyoffice.dmm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/assets/maps/random_rooms/5x3/shadyoffice.dmm b/assets/maps/random_rooms/5x3/shadyoffice.dmm index c8f3fd42034d7..687902fa63b64 100644 --- a/assets/maps/random_rooms/5x3/shadyoffice.dmm +++ b/assets/maps/random_rooms/5x3/shadyoffice.dmm @@ -2,6 +2,7 @@ "a" = ( /obj/table/wood/round, /obj/item/reagent_containers/food/drinks/bottle/empty/rectangular{ + initial_reagents = list("water"=100); pixel_x = -3; pixel_y = 16 }, @@ -22,7 +23,9 @@ /turf/simulated/floor/wood/two, /area/dmm_suite/clear_area) "g" = ( -/obj/decal/poster/wallsign/dead_exec_portrait, +/obj/decal/poster/wallsign/dead_exec_portrait{ + desc = "A portrait of an Italian-American gentleman." + }, /turf/simulated/floor/wood/two, /area/dmm_suite/clear_area) "h" = ( @@ -34,6 +37,12 @@ pixel_x = -6; pixel_y = 7 }, +/obj/decoration/regallamp{ + anchored = 1; + lit = 1; + pixel_x = 8; + pixel_y = 8 + }, /turf/simulated/floor/wood/two, /area/dmm_suite/clear_area) "j" = ( @@ -63,6 +72,7 @@ pixel_y = 9 }, /obj/machinery/light/lamp/green{ + on = 1; pixel_x = -18; pixel_y = 7 }, From 68c7780def3089316b81fd2b48a2e6f7e45882dc Mon Sep 17 00:00:00 2001 From: "Mr. Moriarty" Date: Tue, 21 Jun 2022 17:31:56 +0100 Subject: [PATCH 3/5] Office updates. --- assets/maps/random_rooms/5x3/shadyoffice.dmm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/assets/maps/random_rooms/5x3/shadyoffice.dmm b/assets/maps/random_rooms/5x3/shadyoffice.dmm index 687902fa63b64..7ed6cd9715620 100644 --- a/assets/maps/random_rooms/5x3/shadyoffice.dmm +++ b/assets/maps/random_rooms/5x3/shadyoffice.dmm @@ -24,7 +24,8 @@ /area/dmm_suite/clear_area) "g" = ( /obj/decal/poster/wallsign/dead_exec_portrait{ - desc = "A portrait of an Italian-American gentleman." + desc = "A portrait of an Italian-American gentleman."; + name = "portrait" }, /turf/simulated/floor/wood/two, /area/dmm_suite/clear_area) @@ -61,7 +62,8 @@ }, /obj/machinery/phone/unlisted{ pixel_x = 19; - pixel_y = 6 + pixel_y = 6; + stripe_color = "#333333" }, /obj/item/paper{ pixel_x = -7; @@ -71,10 +73,13 @@ pixel_x = -12; pixel_y = 9 }, -/obj/machinery/light/lamp/green{ +/obj/machinery/light/lamp{ + base_state = "green"; + icon_state = "green1"; on = 1; pixel_x = -18; - pixel_y = 7 + pixel_y = 7; + switchon = 1 }, /turf/simulated/floor/wood/two, /area/dmm_suite/clear_area) From d2d4d0d040ebbff6b308c1522d8355e6b0556518 Mon Sep 17 00:00:00 2001 From: "Mr. Moriarty" Date: Tue, 21 Jun 2022 17:38:10 +0100 Subject: [PATCH 4/5] Office updates. --- assets/maps/random_rooms/5x3/shadyoffice.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/maps/random_rooms/5x3/shadyoffice.dmm b/assets/maps/random_rooms/5x3/shadyoffice.dmm index 7ed6cd9715620..bff3d26918070 100644 --- a/assets/maps/random_rooms/5x3/shadyoffice.dmm +++ b/assets/maps/random_rooms/5x3/shadyoffice.dmm @@ -63,7 +63,7 @@ /obj/machinery/phone/unlisted{ pixel_x = 19; pixel_y = 6; - stripe_color = "#333333" + stripe_color = null }, /obj/item/paper{ pixel_x = -7; From c1add7c0e7c4bf56f40b135ca04c5d1e88b84fd9 Mon Sep 17 00:00:00 2001 From: "Mr. Moriarty" Date: Tue, 21 Jun 2022 21:40:21 +0100 Subject: [PATCH 5/5] Anything not bolted to the ground and made indestructible can and will be stolen. --- assets/maps/random_rooms/5x3/shadyoffice.dmm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/assets/maps/random_rooms/5x3/shadyoffice.dmm b/assets/maps/random_rooms/5x3/shadyoffice.dmm index bff3d26918070..461938526550e 100644 --- a/assets/maps/random_rooms/5x3/shadyoffice.dmm +++ b/assets/maps/random_rooms/5x3/shadyoffice.dmm @@ -40,9 +40,11 @@ }, /obj/decoration/regallamp{ anchored = 1; + deconstructable = 0; lit = 1; pixel_x = 8; - pixel_y = 8 + pixel_y = 8; + securable = 0 }, /turf/simulated/floor/wood/two, /area/dmm_suite/clear_area) @@ -105,9 +107,11 @@ }, /obj/decoration/regallamp{ anchored = 1; + deconstructable = 0; lit = 1; pixel_x = -8; - pixel_y = 8 + pixel_y = 8; + securable = 0 }, /turf/simulated/floor/wood/two, /area/dmm_suite/clear_area)