diff --git a/ModularTegustation/Teguicons/room_spawners/10x10.dmi b/ModularTegustation/Teguicons/room_spawners/10x10.dmi new file mode 100644 index 000000000000..1b31b047c450 Binary files /dev/null and b/ModularTegustation/Teguicons/room_spawners/10x10.dmi differ diff --git a/ModularTegustation/Teguicons/room_spawners/13x15.dmi b/ModularTegustation/Teguicons/room_spawners/13x15.dmi new file mode 100644 index 000000000000..3b71d8b08310 Binary files /dev/null and b/ModularTegustation/Teguicons/room_spawners/13x15.dmi differ diff --git a/ModularTegustation/Teguicons/room_spawners/16x8.dmi b/ModularTegustation/Teguicons/room_spawners/16x8.dmi new file mode 100644 index 000000000000..95206b35db9c Binary files /dev/null and b/ModularTegustation/Teguicons/room_spawners/16x8.dmi differ diff --git a/ModularTegustation/Teguicons/room_spawners/20x20.dmi b/ModularTegustation/Teguicons/room_spawners/20x20.dmi new file mode 100644 index 000000000000..91f2cf4003ba Binary files /dev/null and b/ModularTegustation/Teguicons/room_spawners/20x20.dmi differ diff --git a/ModularTegustation/Teguicons/room_spawners/30x30.dmi b/ModularTegustation/Teguicons/room_spawners/30x30.dmi new file mode 100644 index 000000000000..96832d6e4722 Binary files /dev/null and b/ModularTegustation/Teguicons/room_spawners/30x30.dmi differ diff --git a/ModularTegustation/Teguicons/room_spawners/7x7.dmi b/ModularTegustation/Teguicons/room_spawners/7x7.dmi new file mode 100644 index 000000000000..b510587e2f34 Binary files /dev/null and b/ModularTegustation/Teguicons/room_spawners/7x7.dmi differ diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/bossroom.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/bossroom.dm index 06f7768d9785..5589edc54897 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/bossroom.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/bossroom.dm @@ -1,15 +1,15 @@ /obj/effect/spawner/room/backstreets/bossroom name = "bossroom backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/20x20.dmi' + icon_state = "" room_width = 20 room_height = 20 room_type = "backstreets_bossroom" - /datum/map_template/random_room/backstreets/bossroom name = "Jacques - Bossroom" room_id = "jacques_boss" mappath = "_maps/RandomRooms/backstreets/bossroom/jacques.dmm" - centerspawner = FALSE template_width = 20 template_height = 20 stock = 1 diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/connector.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/connector.dm index ebf48bffabd3..bdaaa5f8b6fe 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/connector.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/connector.dm @@ -1,15 +1,15 @@ /obj/effect/spawner/room/backstreets/connector name = "connector backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/13x15.dmi' + icon_state = "" room_width = 13 room_height = 15 room_type = "backstreets_connector" - /datum/map_template/random_room/backstreets/connector name = "Courtyard - Connector" room_id = "courtyard" mappath = "_maps/RandomRooms/backstreets/connector/courtyard.dmm" - centerspawner = FALSE template_width = 13 template_height = 15 stock = 2 diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/pointofinterest.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/pointofinterest.dm index 7f71ac1af25f..3a19da266f88 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/pointofinterest.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/pointofinterest.dm @@ -1,15 +1,15 @@ /obj/effect/spawner/room/backstreets/pointofinterest name = "pointofinterest backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/30x30.dmi' + icon_state = "" room_width = 30 room_height = 30 room_type = "backstreets_pointofinterest" - /datum/map_template/random_room/backstreets/pointofinterest name = "Robot City - Point of Interest" room_id = "robot_city_poi" mappath = "_maps/RandomRooms/backstreets/pointofinterest/robot_city.dmm" - centerspawner = FALSE template_width = 30 template_height = 30 stock = 1 diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/large/north.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/large/north.dm index 97b32a225b16..bb50b4a86798 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/large/north.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/large/north.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/large_north name = "large north backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/16x8.dmi' + icon_state = "" + dir = NORTH room_width = 16 room_height = 8 room_type = "backstreets_large_north" - /datum/map_template/random_room/backstreets/large_north name = "Apartment - Large North A" room_id = "apartment_lna" mappath = "_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm" - centerspawner = FALSE template_width = 16 template_height = 8 stock = 3 diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/large/south.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/large/south.dm index 720bf25b859d..d0dce44cddf0 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/large/south.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/large/south.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/large_south name = "large south backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/16x8.dmi' + icon_state = "" + dir = SOUTH room_width = 16 room_height = 8 room_type = "backstreets_large_south" - /datum/map_template/random_room/backstreets/large_south name = "Apartment - Large south A" room_id = "apartment_lsa" mappath = "_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm" - centerspawner = FALSE template_width = 16 template_height = 8 stock = 3 diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/east.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/east.dm index 233b55f255a9..6114cac7e197 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/east.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/east.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/medium_east name = "medium east backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/10x10.dmi' + icon_state = "" + dir = EAST room_width = 6 room_height = 10 room_type = "backstreets_medium_east" - /datum/map_template/random_room/backstreets/medium_east name = "Apartment - Medium East A" room_id = "apartment_mea" mappath = "_maps/RandomRooms/backstreets/medium_east/apartment_mea.dmm" - centerspawner = FALSE template_width = 6 template_height = 10 stock = 3 diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/north.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/north.dm index d6dc1c126f4d..a55ec9bba38c 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/north.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/north.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/medium_north name = "medium north backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/10x10.dmi' + icon_state = "" + dir = NORTH room_width = 10 room_height = 6 room_type = "backstreets_medium_north" - /datum/map_template/random_room/backstreets/medium_north name = "Bloody Office - Medium North" room_id = "bloody_office" mappath = "_maps/RandomRooms/backstreets/medium_north/office_bloody.dmm" - centerspawner = FALSE template_width = 10 template_height = 6 stock = 3 diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/south.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/south.dm index 0a48943745cc..ad0579e7903b 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/south.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/south.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/medium_south name = "medium south backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/10x10.dmi' + icon_state = "" + dir = SOUTH room_width = 10 room_height = 6 room_type = "backstreets_medium_south" - /datum/map_template/random_room/backstreets/medium_south name = "Apartment - Medium south A" room_id = "bedroom_msa" mappath = "_maps/RandomRooms/backstreets/medium_south/bedroom_msa.dmm" - centerspawner = FALSE template_width = 10 template_height = 6 stock = 3 diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/west.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/west.dm index 8f829a879a39..3c0bc07022e4 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/west.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/west.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/medium_west name = "medium west backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/10x10.dmi' + icon_state = "" + dir = WEST room_width = 6 room_height = 10 room_type = "backstreets_medium_west" - /datum/map_template/random_room/backstreets/medium_west name = "Medical - Medium west A" room_id = "medical_mwa" mappath = "_maps/RandomRooms/backstreets/medium_west/medical_mwa.dmm" - centerspawner = FALSE template_width = 6 template_height = 10 stock = 3 diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/small/east.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/small/east.dm index c95437678048..016813095bce 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/small/east.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/small/east.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/small_east name = "small east backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/7x7.dmi' + icon_state = "" + dir = EAST room_width = 5 room_height = 7 room_type = "backstreets_small_east" - /datum/map_template/random_room/backstreets/small_east name = "Garbage Bins" room_id = "garbage_se" mappath = "_maps/RandomRooms/backstreets/small_east/garbage.dmm" - centerspawner = FALSE template_width = 5 template_height = 7 stock = 3 diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/small/north.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/small/north.dm index 183a3bb51d36..5f08e6269710 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/small/north.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/small/north.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/small_north name = "small north backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/7x7.dmi' + icon_state = "" + dir = NORTH room_width = 7 room_height = 5 room_type = "backstreets_small_north" - /datum/map_template/random_room/backstreets/small_north name = "Medical - Small North A" room_id = "medical_sna" mappath = "_maps/RandomRooms/backstreets/small_north/medical_sna.dmm" - centerspawner = FALSE template_width = 7 template_height = 5 stock = 3 diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/small/south.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/small/south.dm index 3c5c676902f9..aacf4d73c47b 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/small/south.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/small/south.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/small_south name = "small south backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/7x7.dmi' + icon_state = "" + dir = SOUTH room_width = 7 room_height = 5 room_type = "backstreets_small_south" - /datum/map_template/random_room/backstreets/small_south name = "A Small Drink - Small South" room_id = "drink_sn" mappath = "_maps/RandomRooms/backstreets/small_south/open_drink.dmm" - centerspawner = FALSE template_width = 7 template_height = 5 stock = 3 diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/small/west.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/small/west.dm index a27732d591f1..692573e78b0b 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/small/west.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/small/west.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/small_west name = "small west backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/7x7.dmi' + icon_state = "" + dir = WEST room_width = 5 room_height = 7 room_type = "backstreets_small_west" - /datum/map_template/random_room/backstreets/small_west name = "Robot - Small West" room_id = "robot_swa" mappath = "_maps/RandomRooms/backstreets/small_west/robot_swa.dmm" - centerspawner = FALSE template_width = 5 template_height = 7 stock = 3 diff --git a/ModularTegustation/tegu_items/backstreets/templates.dm b/ModularTegustation/tegu_items/backstreets/templates.dm index ab74715d0930..31806e1363f4 100644 --- a/ModularTegustation/tegu_items/backstreets/templates.dm +++ b/ModularTegustation/tegu_items/backstreets/templates.dm @@ -9,7 +9,6 @@ name = "Regular Template" room_id = "template_a" mappath = "_maps/RandomRooms/backstreetlayout/standard.dmm" - centerspawner = FALSE template_width = 254 template_height = 109 room_type = "backstreets_template" diff --git a/code/modules/mapping/random_rooms.dm b/code/modules/mapping/random_rooms.dm index 8e25a1391168..223b725fc0f9 100644 --- a/code/modules/mapping/random_rooms.dm +++ b/code/modules/mapping/random_rooms.dm @@ -1,7 +1,7 @@ /datum/map_template/random_room var/room_id //The SSmapping random_room_template list is ordered by this var var/spawned //Whether this template (on the random_room template list) has been spawned - var/centerspawner = TRUE + var/centerspawner = FALSE var/template_width = 0 var/template_height = 0 var/weight = 10 //weight a room has to appear @@ -13,7 +13,6 @@ name = "Cybersun Warehouse - Default" room_id = "cybersun_default" mappath = "_maps/RandomRooms/ruins/cybersun_default.dmm" - centerspawner = FALSE template_width = 6 template_height = 7 room_type = "cybersun" @@ -22,7 +21,6 @@ name = "Cybersun Warehouse - Rich" room_id = "cybersun_rich" mappath = "_maps/RandomRooms/ruins/cybersun_rich.dmm" - centerspawner = FALSE template_width = 6 template_height = 7 weight = 5 @@ -32,7 +30,6 @@ name = "Cybersun Medical - Default" room_id = "cybersun_med_default" mappath = "_maps/RandomRooms/ruins/cybersun_med_default.dmm" - centerspawner = FALSE template_width = 3 template_height = 5 room_type = "cybersun_med" @@ -41,7 +38,6 @@ name = "Cybersun Medical - Rich" room_id = "cybersun_med_rich" mappath = "_maps/RandomRooms/ruins/cybersun_med_rich.dmm" - centerspawner = FALSE template_width = 3 template_height = 5 weight = 5 diff --git a/lobotomy-corp13.dme b/lobotomy-corp13.dme index e7a3212597d8..bdae474ab82b 100644 --- a/lobotomy-corp13.dme +++ b/lobotomy-corp13.dme @@ -3966,9 +3966,9 @@ #include "ModularTegustation\ego_weapons\melee\non_abnormality\cinq.dm" #include "ModularTegustation\ego_weapons\melee\non_abnormality\color_fixer.dm" #include "ModularTegustation\ego_weapons\melee\non_abnormality\dawn.dm" +#include "ModularTegustation\ego_weapons\melee\non_abnormality\echo_office.dm" #include "ModularTegustation\ego_weapons\melee\non_abnormality\fullstop.dm" #include "ModularTegustation\ego_weapons\melee\non_abnormality\gradeone.dm" -#include "ModularTegustation\ego_weapons\melee\non_abnormality\echo_office.dm" #include "ModularTegustation\ego_weapons\melee\non_abnormality\hana.dm" #include "ModularTegustation\ego_weapons\melee\non_abnormality\index.dm" #include "ModularTegustation\ego_weapons\melee\non_abnormality\jcorp.dm"