From be91fdc0b80d30ee575dd14ee2b80bce0c4a6a4f Mon Sep 17 00:00:00 2001 From: S34N <12197162+S34NW@users.noreply.github.com> Date: Wed, 16 Nov 2022 00:59:10 +0000 Subject: [PATCH] Wizard den remap (#19575) * wiz den refresh * brass and wood * final tweaks * wrong door * mira --- _maps/map_files/generic/centcomm.dmm | 2935 +++++++++-------- code/game/area/ss13_areas.dm | 2 +- code/game/objects/items/candle.dm | 15 + .../crates_lockers/closets/gimmick.dm | 20 +- .../turfs/simulated/walls_indestructible.dm | 7 + 5 files changed, 1651 insertions(+), 1328 deletions(-) diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index 1df9d795c5a..8a3fb75e1fe 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -30,7 +30,15 @@ /turf/simulated/floor/plasteel/dark, /area/centcom/evac) "ai" = ( -/turf/simulated/wall/indestructible/uranium, +/obj/effect/turf_decal/woodsiding{ + dir = 1 + }, +/obj/structure/curtain/open{ + color = "#222222"; + name = "wizard council curtain"; + pixel_y = -2 + }, +/turf/simulated/floor/carpet/red, /area/wizard_station) "aj" = ( /obj/structure/rack/holorack, @@ -257,6 +265,12 @@ icon_state = "asteroid" }, /area/holodeck/source_picnicarea) +"aZ" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/item/dice, +/obj/effect/turf_decal/woodsiding, +/turf/simulated/floor/wood, +/area/wizard_station) "ba" = ( /obj/structure/chair/stool/holostool{ dir = 1 @@ -637,11 +651,13 @@ /turf/simulated/floor/beach/away/sand, /area/ninja/holding) "cH" = ( -/obj/structure/bookcase{ - name = "Forbidden Knowledge" +/obj/structure/table/wood, +/obj/item/tank/internals/emergency_oxygen/double/vox, +/obj/item/clothing/mask/breath/vox, +/obj/item/candle/eternal/wizard{ + pixel_y = 11 }, -/obj/effect/decal/cleanable/cobweb, -/turf/simulated/floor/engine/cult, +/turf/simulated/floor/carpet/black, /area/wizard_station) "cI" = ( /obj/structure/railing, @@ -660,10 +676,8 @@ /turf/simulated/floor/plating/airless, /area/shuttle/administration) "cK" = ( -/obj/structure/bookcase{ - name = "Forbidden Knowledge" - }, -/turf/simulated/floor/engine/cult, +/obj/machinery/vending/magivend, +/turf/simulated/floor/carpet/black, /area/wizard_station) "cL" = ( /turf/simulated/floor/holofloor{ @@ -672,7 +686,11 @@ }, /area/holodeck/source_boxingcourt) "cN" = ( -/turf/simulated/floor/engine/cult, +/obj/structure/chair/sofa/corner{ + dir = 6; + color = "#63009c" + }, +/turf/simulated/floor/wood, /area/wizard_station) "cO" = ( /obj/structure/flora/tree/pine, @@ -681,9 +699,9 @@ }, /area/holodeck/source_snowfield) "cP" = ( -/obj/structure/table/wood, -/obj/machinery/computer/library, -/turf/simulated/floor/engine/cult, +/obj/item/trash/plate, +/obj/structure/table/wood/fancy/black, +/turf/simulated/floor/carpet/purple, /area/wizard_station) "cQ" = ( /turf/simulated/floor/holofloor{ @@ -692,37 +710,17 @@ }, /area/holodeck/source_basketball) "cS" = ( -/obj/machinery/vending/magivend, -/turf/simulated/floor/engine/cult, +/obj/effect/landmark/spawner/teleport_scroll, +/obj/structure/table/wood/fancy/black, +/obj/item/paper/crumpled/bloody/ruins/lavaland/clown_planet{ + name = "our demands"; + info = "Deliver five cream pies to the agreed place or your apprentice gets honked again" + }, +/turf/simulated/floor/carpet/purple, /area/wizard_station) "cU" = ( -/obj/machinery/vending/snack/free, -/turf/simulated/floor/engine/cult, -/area/wizard_station) -"cV" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/under/color/lightpurple, -/obj/item/clothing/under/color/purple, -/obj/item/clothing/head/wizard/red, -/obj/item/storage/backpack/satchel, -/obj/item/storage/backpack/satchel, -/obj/item/clothing/suit/wizrobe/red, -/obj/item/clothing/head/wizard, -/obj/item/clothing/suit/wizrobe, -/obj/item/clothing/shoes/sandal, -/obj/item/clothing/shoes/sandal, -/turf/simulated/floor/carpet, -/area/wizard_station) -"cW" = ( -/obj/structure/mirror/magic{ - pixel_y = 28 - }, -/turf/simulated/floor/carpet, -/area/wizard_station) -"cX" = ( -/obj/structure/bed, -/obj/item/bedsheet/wiz, -/turf/simulated/floor/carpet, +/obj/item/trash/tastybread, +/turf/simulated/floor/carpet/purple, /area/wizard_station) "cY" = ( /obj/structure/table, @@ -752,13 +750,6 @@ /obj/item/camera, /turf/simulated/floor/beach/away/sand, /area/ninja/holding) -"dd" = ( -/turf/simulated/floor/carpet, -/area/wizard_station) -"de" = ( -/obj/effect/landmark/spawner/wiz, -/turf/simulated/floor/carpet, -/area/wizard_station) "df" = ( /turf/simulated/wall/indestructible/fakeglass, /area/ninja/outpost) @@ -909,33 +900,12 @@ icon_state = "red" }, /area/holodeck/source_boxingcourt) -"dN" = ( -/obj/structure/bookcase{ - name = "bookcase (Tactics)" - }, -/turf/simulated/floor/engine/cult, -/area/wizard_station) "dO" = ( /turf/simulated/floor/holofloor{ dir = 4; icon_state = "green" }, /area/holodeck/source_boxingcourt) -"dP" = ( -/obj/item/radio/intercom/syndicate{ - pixel_x = 28 - }, -/turf/simulated/floor/engine/cult, -/area/wizard_station) -"dQ" = ( -/obj/structure/table/wood, -/turf/simulated/floor/carpet, -/area/wizard_station) -"dR" = ( -/obj/structure/table/wood, -/obj/effect/landmark/spawner/teleport_scroll, -/turf/simulated/floor/carpet, -/area/wizard_station) "dS" = ( /obj/docking_port/stationary/transit{ dir = 4; @@ -998,8 +968,8 @@ /turf/simulated/floor/plating, /area/centcom) "ec" = ( -/obj/structure/chair/comfy/purp, -/turf/simulated/floor/engine/cult, +/obj/item/trash/chips, +/turf/simulated/floor/carpet/purple, /area/wizard_station) "ed" = ( /turf/simulated/floor/wood, @@ -1033,8 +1003,10 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "ej" = ( -/obj/structure/bookcase, -/turf/simulated/floor/engine/cult, +/obj/structure/chair/comfy/purp{ + dir = 8 + }, +/turf/simulated/floor/carpet/black, /area/wizard_station) "ek" = ( /obj/structure/chair/sofa/corp{ @@ -1057,43 +1029,23 @@ }, /area/holodeck/source_beach) "en" = ( -/obj/structure/chair/comfy/purp{ - dir = 4 +/obj/structure/table/wood/fancy/black, +/obj/item/candle/eternal/wizard{ + pixel_y = 5; + pixel_x = -7 }, -/turf/simulated/floor/engine/cult, +/obj/item/reagent_containers/food/drinks/mugwort{ + pixel_y = 6; + pixel_x = 8 + }, +/turf/simulated/floor/carpet/purple, /area/wizard_station) "eo" = ( -/obj/structure/table/wood, -/obj/machinery/recharger, -/turf/simulated/floor/engine/cult, -/area/wizard_station) -"ep" = ( -/obj/structure/table/wood, -/obj/item/dice/d20, -/obj/item/dice, -/turf/simulated/floor/engine/cult, -/area/wizard_station) -"eu" = ( -/obj/structure/rack, -/obj/item/clothing/suit/wizrobe/marisa, -/obj/item/clothing/shoes/sandal/marisa, -/obj/item/clothing/head/wizard/marisa, -/obj/item/twohanded/staff/broom, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/purple, /area/wizard_station) "ev" = ( /turf/simulated/floor/beach/sand, /area/holodeck/source_beach) -"ew" = ( -/obj/structure/rack, -/obj/item/clothing/suit/wizrobe/magusblue, -/obj/item/clothing/head/wizard/magus, -/obj/item/twohanded/staff, -/obj/item/clothing/suit/wizrobe/magusred, -/obj/item/clothing/head/wizard/magus, -/obj/item/twohanded/staff, -/turf/simulated/floor/wood, -/area/wizard_station) "ex" = ( /obj/docking_port/stationary/transit{ dir = 8; @@ -1193,32 +1145,17 @@ /turf/simulated/floor/holofloor, /area/holodeck/source_thunderdomecourt) "eO" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/mugwort, -/turf/simulated/floor/engine/cult, -/area/wizard_station) -"eP" = ( -/obj/structure/table/wood, -/obj/item/stack/spacecash, -/turf/simulated/floor/engine/cult, +/obj/effect/turf_decal/woodsiding{ + dir = 1 + }, +/obj/structure/mineral_door/wood{ + name = "Main chamber" + }, +/turf/simulated/floor/wood, /area/wizard_station) "eQ" = ( /turf/simulated/floor/holofloor, /area/holodeck/source_boxingcourt) -"eR" = ( -/obj/structure/rack, -/obj/item/tank/internals/emergency_oxygen/double/vox, -/obj/item/clothing/mask/breath/vox, -/turf/simulated/floor/wood, -/area/wizard_station) -"eT" = ( -/obj/structure/rack, -/obj/item/clothing/under/plasmaman/wizard, -/obj/item/clothing/head/helmet/space/plasmaman/wizard, -/obj/item/clothing/mask/breath, -/obj/item/tank/internals/plasmaman/belt/full, -/turf/simulated/floor/wood, -/area/wizard_station) "eU" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'FOURTH WALL'."; @@ -1305,19 +1242,9 @@ /obj/machinery/poolcontroller/invisible, /turf/simulated/floor/beach/away/water, /area/ninja/holding) -"ff" = ( -/obj/item/flag/wiz, -/turf/simulated/floor/engine/cult, -/area/wizard_station) "fg" = ( /turf/simulated/wall/indestructible/wood, /area/ninja/holding) -"fh" = ( -/obj/structure/chair/comfy/purp{ - dir = 1 - }, -/turf/simulated/floor/engine/cult, -/area/wizard_station) "fi" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -1328,36 +1255,17 @@ icon_state = "cafeteria" }, /area/ninja/holding) -"fk" = ( -/turf/simulated/wall/indestructible/fakeglass{ - color = "#008000" - }, -/area/wizard_station) "fm" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/centcom) "fn" = ( -/obj/item/trash/raisins, -/turf/simulated/floor/engine/cult, -/area/wizard_station) -"fo" = ( -/obj/structure/showcase, -/obj/structure/window/reinforced/clockwork{ - dir = 8 +/obj/structure/chair/sofa/left{ + dir = 4; + color = "#63009c" }, /turf/simulated/floor/wood, /area/wizard_station) -"fp" = ( -/obj/structure/table/reinforced, -/obj/structure/kitchenspike, -/turf/simulated/floor/wood, -/area/wizard_station) -"fq" = ( -/obj/effect/decal/cleanable/cobweb2, -/obj/structure/showcase, -/turf/simulated/floor/wood, -/area/wizard_station) "fr" = ( /obj/docking_port/stationary/transit{ dir = 4; @@ -1396,11 +1304,18 @@ /turf/simulated/floor/engine, /area/ninja/holding) "fv" = ( -/obj/effect/decal/remains/human, -/turf/simulated/floor/grass, +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/mug/novelty, +/obj/item/candle/eternal/wizard{ + pixel_y = 11 + }, +/turf/simulated/floor/wood, /area/wizard_station) "fw" = ( -/turf/simulated/floor/grass, +/obj/structure/chair/sofa/right{ + color = "#63009c" + }, +/turf/simulated/floor/wood, /area/wizard_station) "fx" = ( /obj/effect/decal/cleanable/blood, @@ -1416,28 +1331,6 @@ /mob/living/carbon/human/monkey, /turf/simulated/floor/wood, /area/wizard_station) -"fA" = ( -/mob/living/simple_animal/hostile/creature{ - name = "Experiment 35b" - }, -/turf/simulated/floor/grass, -/area/wizard_station) -"fB" = ( -/obj/effect/decal/cleanable/molten_object, -/turf/simulated/floor/grass, -/area/wizard_station) -"fC" = ( -/obj/item/trash/chips, -/turf/simulated/floor/engine/cult, -/area/wizard_station) -"fD" = ( -/obj/structure/rack, -/obj/item/kitchen/knife/ritual, -/obj/structure/window/reinforced/clockwork{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/wizard_station) "fE" = ( /obj/structure/table, /obj/item/storage/box/handcuffs, @@ -1446,11 +1339,6 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) -"fG" = ( -/obj/structure/rack, -/obj/item/kitchen/knife/ritual, -/turf/simulated/floor/wood, -/area/wizard_station) "fH" = ( /obj/docking_port/stationary/transit{ dir = 4; @@ -1554,6 +1442,14 @@ }, /turf/simulated/floor/plasteel, /area/tdome/arena_source) +"fX" = ( +/obj/structure/table/wood, +/obj/item/candle/eternal/wizard{ + pixel_y = 11 + }, +/obj/item/coin/uranium, +/turf/simulated/floor/wood, +/area/wizard_station) "fY" = ( /obj/structure/rack, /obj/item/clothing/under/color/red, @@ -1582,6 +1478,12 @@ }, /turf/simulated/floor/plasteel, /area/tdome/arena_source) +"ga" = ( +/obj/machinery/vending/snack/free{ + name = "\improper Wizmore Chocolate Corp" + }, +/turf/simulated/floor/wood, +/area/wizard_station) "gb" = ( /obj/structure/table/wood, /obj/item/clothing/accessory/medal/silver{ @@ -1719,6 +1621,13 @@ }, /turf/simulated/floor/plating/airless, /area/shuttle/syndicate_elite) +"gB" = ( +/obj/structure/dresser, +/obj/item/candle/eternal/wizard{ + pixel_y = 11 + }, +/turf/simulated/floor/carpet/purple, +/area/wizard_station) "gC" = ( /obj/docking_port/stationary/transit{ dheight = 9; @@ -2019,6 +1928,14 @@ }, /turf/simulated/floor/plating, /area/shuttle/administration) +"hy" = ( +/obj/effect/decal/cleanable/cobweb2, +/obj/item/twohanded/required/kirbyplants, +/obj/structure/window/reinforced/clockwork{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/wizard_station) "hA" = ( /obj/machinery/door/airlock/external{ id_tag = "sst_away"; @@ -2448,6 +2365,11 @@ /obj/item/flag/syndi, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) +"iO" = ( +/obj/machinery/computer/library, +/obj/structure/table/wood, +/turf/simulated/floor/wood, +/area/wizard_station) "iP" = ( /obj/structure/chair{ dir = 1 @@ -2509,6 +2431,14 @@ /obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) +"jb" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/item/trash/semki, +/obj/effect/turf_decal/woodsiding{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/wizard_station) "je" = ( /obj/machinery/mech_bay_recharge_port/upgraded/unsimulated{ dir = 8 @@ -2695,10 +2625,27 @@ }, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) +"jL" = ( +/obj/structure/chair/brass{ + name = "arch wizard's throne" + }, +/obj/effect/turf_decal/woodsiding{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/wizard_station) "jM" = ( /obj/effect/landmark/spawner/syndicate_infiltrator_leader, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) +"jN" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/item/candle/eternal/wizard, +/obj/effect/turf_decal/woodsiding{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/wizard_station) "jO" = ( /obj/machinery/computer/shuttle/syndicate{ dir = 1; @@ -2993,6 +2940,11 @@ /obj/item/toy/figure/crew/syndie, /turf/simulated/floor/plating/asteroid/snow/airless, /area/syndicate_mothership) +"kJ" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/effect/turf_decal/woodsiding, +/turf/simulated/floor/wood, +/area/wizard_station) "kK" = ( /obj/item/disk/plantgene, /turf/simulated/floor/plating/asteroid/snow/airless, @@ -4463,9 +4415,25 @@ }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/trade/sol) +"pm" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/item/gavelblock{ + desc = "Smack it with a gavel hammer when the wizard council gets rowdy." + }, +/obj/item/gavelhammer{ + desc = "Order, order! No bombs in my council chamber." + }, +/turf/simulated/floor/wood, +/area/wizard_station) "po" = ( /turf/simulated/wall/indestructible/fakeglass, /area/trader_station/sol) +"pp" = ( +/obj/structure/displaycase{ + start_showpiece_type = /obj/item/toy/spinningtoy + }, +/turf/simulated/floor/carpet/purple, +/area/wizard_station) "pq" = ( /obj/machinery/clonepod/upgraded, /obj/machinery/light/spot{ @@ -4529,6 +4497,14 @@ /obj/item/ammo_casing/shotgun/dart, /turf/simulated/floor/plasteel/freezer, /area/admin) +"pH" = ( +/obj/structure/table/wood, +/obj/item/candle/eternal/wizard{ + pixel_y = 5; + pixel_x = -7 + }, +/turf/simulated/floor/carpet/black, +/area/wizard_station) "pJ" = ( /obj/structure/flora/junglebush/large, /turf/simulated/floor/grass/jungle, @@ -4726,6 +4702,9 @@ /obj/structure/closet/crate/can, /turf/simulated/floor/wood, /area/centcom/specops) +"qu" = ( +/turf/simulated/floor/carpet/red, +/area/wizard_station) "qv" = ( /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating/airless, @@ -5284,6 +5263,10 @@ "sk" = ( /turf/simulated/floor/plasteel/dark, /area/centcom/suppy) +"sl" = ( +/obj/effect/decal/remains/human, +/turf/simulated/floor/grass/jungle, +/area/wizard_station) "sm" = ( /turf/simulated/wall/indestructible/fakeglass, /area/centcom/control) @@ -5291,6 +5274,10 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) +"so" = ( +/obj/structure/closet/cabinet/wizard, +/turf/simulated/floor/carpet/black, +/area/wizard_station) "sp" = ( /obj/structure/railing, /turf/simulated/floor/plasteel, @@ -5473,6 +5460,12 @@ icon_state = "vault" }, /area/tdome/tdomeadmin) +"sX" = ( +/obj/item/radio/intercom/syndicate{ + pixel_x = 28 + }, +/turf/simulated/floor/carpet/red, +/area/wizard_station) "sY" = ( /obj/structure/railing, /obj/structure/chair{ @@ -6679,6 +6672,9 @@ }, /turf/simulated/floor/plasteel, /area/admin) +"xo" = ( +/turf/simulated/floor/grass/jungle, +/area/wizard_station) "xr" = ( /obj/structure/table, /obj/item/card/id/centcom{ @@ -6703,6 +6699,9 @@ /obj/structure/flora/rock/pile/largejungle, /turf/simulated/floor/grass/jungle, /area/centcom/evac) +"xH" = ( +/turf/simulated/wall/indestructible/wood, +/area/wizard_station) "xI" = ( /turf/simulated/wall/indestructible/fakeglass, /area/centcom/suppy) @@ -6719,6 +6718,16 @@ icon_state = "vault" }, /area/centcom/specops) +"xO" = ( +/obj/structure/rack, +/obj/item/clothing/suit/wizrobe/magusblue, +/obj/item/clothing/head/wizard/magus, +/obj/item/twohanded/staff, +/obj/item/clothing/suit/wizrobe/magusred, +/obj/item/clothing/head/wizard/magus, +/obj/item/twohanded/staff, +/turf/simulated/floor/carpet/black, +/area/wizard_station) "xP" = ( /obj/structure/fans/tiny/invisible, /obj/machinery/door/airlock/external, @@ -6774,6 +6783,12 @@ }, /turf/simulated/floor/wood, /area/centcom/control) +"yp" = ( +/obj/item/radio/intercom/syndicate{ + pixel_x = 28 + }, +/turf/simulated/floor/carpet/black, +/area/wizard_station) "yq" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/grassybush, @@ -6785,6 +6800,10 @@ /obj/effect/turf_decal/bot, /turf/simulated/floor/wood, /area/tdome/tdomeobserve) +"yx" = ( +/obj/structure/flora/rock/jungle, +/turf/simulated/floor/grass/jungle, +/area/wizard_station) "yH" = ( /obj/structure/railing, /turf/simulated/floor/plasteel{ @@ -6846,6 +6865,10 @@ }, /turf/simulated/floor/mineral/titanium, /area/shuttle/transport) +"zv" = ( +/obj/item/flag/wiz, +/turf/simulated/floor/wood, +/area/wizard_station) "zy" = ( /obj/machinery/door/airlock/public/glass{ name = "Computer Hub" @@ -6922,6 +6945,24 @@ }, /turf/simulated/floor/wood, /area/trader_station/sol) +"Aj" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/item/stack/spacecash, +/obj/effect/turf_decal/woodsiding{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/wizard_station) +"Ak" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/item/radio/phone{ + desc = "How else would the wizards order pizza?" + }, +/obj/effect/turf_decal/woodsiding{ + dir = 6 + }, +/turf/simulated/floor/wood, +/area/wizard_station) "An" = ( /obj/item/circular_saw, /obj/item/hemostat{ @@ -7055,6 +7096,22 @@ /obj/machinery/status_display, /turf/simulated/wall/indestructible/riveted, /area/centcom/gamma) +"Ba" = ( +/obj/structure/rack, +/obj/item/clothing/suit/wizrobe/marisa, +/obj/item/clothing/shoes/sandal/marisa, +/obj/item/clothing/head/wizard/marisa, +/obj/item/twohanded/staff/broom, +/turf/simulated/floor/carpet/black, +/area/wizard_station) +"Bb" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/item/bikehorn/airhorn, +/turf/simulated/floor/plasteel/goonplaque{ + desc = "Nosey little bastard aren't you?"; + name = "Nosey little bastard aren't you?" + }, +/area/wizard_station) "Bd" = ( /obj/machinery/light/spot{ dir = 1 @@ -7235,6 +7292,10 @@ }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/supply) +"BR" = ( +/obj/structure/kitchenspike, +/turf/simulated/floor/wood, +/area/wizard_station) "BT" = ( /obj/effect/landmark/spawner/tdomeobserve, /turf/simulated/floor/plasteel/dark, @@ -7248,6 +7309,9 @@ icon_state = "bar" }, /area/syndicate_mothership) +"BX" = ( +/turf/simulated/floor/plating/asteroid/basalt/airless, +/area/wizard_station) "BY" = ( /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -7509,6 +7573,19 @@ icon_state = "green" }, /area/holodeck/source_boxingcourt) +"CU" = ( +/obj/structure/chair/comfy/purp{ + name = "wizard council throne"; + dir = 1 + }, +/turf/simulated/floor/carpet/red, +/area/wizard_station) +"CY" = ( +/obj/machinery/vending/artvend{ + name = "\improper WizArtVend" + }, +/turf/simulated/floor/wood, +/area/wizard_station) "CZ" = ( /obj/structure/window/reinforced, /turf/simulated/floor/plasteel/dark, @@ -7793,6 +7870,10 @@ }, /turf/simulated/floor/wood, /area/trader_station/sol) +"Ee" = ( +/obj/structure/flora/rock/pile/largejungle, +/turf/simulated/floor/grass/jungle, +/area/wizard_station) "Ef" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -8114,6 +8195,14 @@ /obj/item/scalpel, /turf/simulated/floor/plasteel/dark, /area/admin) +"FH" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/item/stack/ore/uranium, +/obj/effect/turf_decal/woodsiding{ + dir = 10 + }, +/turf/simulated/floor/wood, +/area/wizard_station) "FJ" = ( /obj/structure/table/reinforced, /obj/item/storage/box/mousetraps, @@ -8137,12 +8226,25 @@ /obj/item/storage/box/grenades, /turf/simulated/floor/plasteel/dark, /area/admin) +"FN" = ( +/obj/machinery/recharger, +/obj/structure/table/wood, +/turf/simulated/floor/wood, +/area/wizard_station) "FP" = ( /obj/structure/chair/comfy/brown{ dir = 8 }, /turf/simulated/floor/transparent/glass, /area/centcom/specops) +"FQ" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/item/dice/d20, +/obj/effect/turf_decal/woodsiding{ + dir = 5 + }, +/turf/simulated/floor/wood, +/area/wizard_station) "FS" = ( /obj/structure/railing{ dir = 8 @@ -8229,6 +8331,14 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) +"Gj" = ( +/obj/structure/rack, +/obj/item/kitchen/knife/ritual, +/obj/structure/window/reinforced/clockwork{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/wizard_station) "Gn" = ( /obj/item/gun/projectile/automatic/pistol/m1911, /obj/item/ammo_box/magazine/m45, @@ -8288,6 +8398,12 @@ }, /turf/simulated/floor/wood, /area/centcom/control) +"Gv" = ( +/obj/item/radio/intercom/syndicate{ + pixel_x = 28 + }, +/turf/simulated/floor/carpet/purple, +/area/wizard_station) "Gw" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -28 @@ -8331,6 +8447,14 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) +"GG" = ( +/obj/structure/rack, +/obj/item/radio/intercom/syndicate{ + pixel_x = -28 + }, +/obj/item/kitchen/knife/carrotshiv, +/turf/simulated/floor/wood, +/area/wizard_station) "GI" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -8371,6 +8495,9 @@ }, /turf/simulated/floor/plasteel/dark, /area/admin) +"GN" = ( +/turf/simulated/wall/indestructible/fakeglass/brass, +/area/wizard_station) "GO" = ( /obj/structure/closet/crate/can, /turf/simulated/floor/plasteel/dark, @@ -8493,6 +8620,10 @@ "Hi" = ( /turf/simulated/floor/plasteel/dark, /area/centcom/gamma) +"Hj" = ( +/obj/structure/flora/tree/jungle/small, +/turf/simulated/floor/grass/jungle, +/area/wizard_station) "Hl" = ( /obj/machinery/computer/secure_data{ dir = 4 @@ -9572,6 +9703,9 @@ }, /turf/simulated/wall/indestructible/riveted, /area/centcom/specops) +"Ln" = ( +/turf/simulated/floor/carpet/black, +/area/wizard_station) "Ls" = ( /obj/machinery/door_control/no_emag{ id = "ASSAULT"; @@ -9595,6 +9729,16 @@ icon_state = "green" }, /area/centcom/evac) +"Lu" = ( +/obj/structure/flora/junglebush/large, +/turf/simulated/floor/grass/jungle, +/area/wizard_station) +"Lv" = ( +/obj/structure/chair/comfy/black{ + dir = 1 + }, +/turf/simulated/floor/carpet/purple, +/area/wizard_station) "Lw" = ( /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/mineral/plastitanium/red, @@ -9687,6 +9831,14 @@ icon_state = "neutralcorner" }, /area/shuttle/escape) +"LT" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/item/storage/box/matches, +/obj/effect/turf_decal/woodsiding{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/wizard_station) "LU" = ( /obj/machinery/door/airlock/titanium/glass{ name = "Emergency Airlock Access"; @@ -9985,6 +10137,16 @@ icon_state = "asteroid1" }, /area/holodeck/source_desert) +"MU" = ( +/obj/machinery/vending/cola/free{ + name = "\improper Wizbust Softdrinks" + }, +/turf/simulated/floor/wood, +/area/wizard_station) +"MV" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/wood, +/area/wizard_station) "MX" = ( /obj/effect/turf_decal/loading_area{ dir = 4 @@ -10304,12 +10466,23 @@ /obj/item/flag/sec, /turf/simulated/floor/plasteel/dark, /area/centcom/control) +"Os" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/item/candle/eternal/wizard, +/turf/simulated/floor/carpet/red, +/area/wizard_station) "Ot" = ( /obj/structure/chair/comfy/red{ dir = 1 }, /turf/simulated/floor/carpet/black, /area/centcom/evac) +"Ou" = ( +/obj/structure/mirror/magic{ + pixel_x = -28 + }, +/turf/simulated/floor/carpet/black, +/area/wizard_station) "Ov" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/cans/madminmalt, @@ -10392,6 +10565,17 @@ }, /turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) +"OL" = ( +/obj/structure/curtain/open/shower, +/obj/machinery/shower{ + dir = 1; + pixel_y = -2 + }, +/obj/structure/window/basic{ + dir = 1 + }, +/turf/simulated/floor/plasteel/freezer, +/area/wizard_station) "ON" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -10764,6 +10948,12 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) +"Qj" = ( +/obj/structure/chair/sofa{ + color = "#63009c" + }, +/turf/simulated/floor/wood, +/area/wizard_station) "Qm" = ( /obj/structure/rack, /obj/item/clothing/suit/space/hardsuit/syndi, @@ -10773,6 +10963,18 @@ }, /turf/simulated/floor/plasteel, /area/admin) +"Qn" = ( +/obj/effect/turf_decal/woodsiding{ + dir = 8 + }, +/obj/effect/turf_decal/woodsiding{ + dir = 4 + }, +/obj/structure/mineral_door/wood{ + name = "Changing chamber" + }, +/turf/simulated/floor/wood, +/area/wizard_station) "Qr" = ( /turf/simulated/floor/plasteel{ dir = 9; @@ -10799,6 +11001,13 @@ icon_state = "darkblue" }, /area/centcom/control) +"Qy" = ( +/mob/living/simple_animal/hostile/creature{ + name = "Experiment 35b" + }, +/obj/item/candle/eternal/wizard, +/turf/simulated/floor/grass/jungle, +/area/wizard_station) "QA" = ( /obj/machinery/computer/card{ dir = 4 @@ -10918,6 +11127,12 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"QU" = ( +/obj/structure/bed, +/obj/effect/landmark/spawner/wiz, +/obj/item/bedsheet/wiz, +/turf/simulated/floor/carpet/purple, +/area/wizard_station) "QV" = ( /obj/item/clothing/under/color/rainbow, /obj/item/clothing/glasses/sunglasses_fake, @@ -11011,6 +11226,16 @@ "Rs" = ( /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/specops) +"Rt" = ( +/obj/structure/table/wood, +/obj/item/razor{ + pixel_x = 10 + }, +/obj/item/candle/eternal/wizard{ + pixel_y = 11 + }, +/turf/simulated/floor/wood, +/area/wizard_station) "Ru" = ( /obj/structure/closet/emcloset, /obj/item/tank/internals/emergency_oxygen/engi, @@ -11052,6 +11277,11 @@ /obj/structure/table, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) +"RA" = ( +/obj/structure/table/wood/fancy/black, +/obj/item/decorations/sticky_decorations/flammable/googlyeyes, +/turf/simulated/floor/carpet/purple, +/area/wizard_station) "RB" = ( /obj/structure/chair, /obj/effect/turf_decal/stripes/line{ @@ -11120,6 +11350,11 @@ /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel/dark, /area/centcom/control) +"RT" = ( +/obj/effect/decal/cleanable/molten_object/large, +/obj/effect/decal/remains/human, +/turf/simulated/floor/grass/jungle, +/area/wizard_station) "RU" = ( /obj/effect/overlay/palmtree_l, /obj/effect/overlay/coconut, @@ -11592,12 +11827,24 @@ icon_state = "whiteblue" }, /area/centcom/control) +"Uc" = ( +/obj/structure/rack, +/obj/item/clothing/under/plasmaman/wizard, +/obj/item/clothing/head/helmet/space/plasmaman/wizard, +/obj/item/clothing/mask/breath, +/obj/item/tank/internals/plasmaman/belt/full, +/turf/simulated/floor/carpet/black, +/area/wizard_station) "Ud" = ( /obj/machinery/door/airlock/centcom{ name = "Nanotrasen Asset Protection" }, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) +"Ue" = ( +/obj/structure/flora/grass/jungle, +/turf/simulated/floor/grass/jungle, +/area/wizard_station) "Uf" = ( /obj/machinery/door/airlock/centcom{ name = "Nanotrasen Asset Protection" @@ -11732,6 +11979,9 @@ icon_state = "blue" }, /area/holodeck/source_knightarena) +"UJ" = ( +/turf/simulated/floor/plating/lava/smooth/airless, +/area/wizard_station) "UK" = ( /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) @@ -11789,6 +12039,14 @@ icon_state = "vault" }, /area/centcom/specops) +"Vf" = ( +/obj/structure/statue/sandstone/venus{ + color = "#5c5c5c"; + desc = "She lies just out of reach, as always. She somehow has your only toolbox."; + dir = 1 + }, +/turf/simulated/floor/plating/asteroid/basalt/airless, +/area/wizard_station) "Vg" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -11858,6 +12116,9 @@ /obj/item/reagent_containers/food/drinks/cans/madminmalt, /turf/simulated/floor/plasteel, /area/centcom/evac) +"Vx" = ( +/turf/simulated/floor/plasteel/freezer, +/area/wizard_station) "Vy" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, @@ -11971,6 +12232,13 @@ icon_state = "brown" }, /area/shuttle/escape) +"VX" = ( +/obj/item/bikehorn/rubberducky, +/obj/structure/window/basic{ + dir = 1 + }, +/turf/simulated/floor/plasteel/freezer, +/area/wizard_station) "VY" = ( /obj/machinery/recharge_station/upgraded, /turf/simulated/floor/plasteel{ @@ -12013,6 +12281,10 @@ icon_state = "brown" }, /area/shuttle/escape) +"Wk" = ( +/obj/structure/flora/junglebush, +/turf/simulated/floor/grass/jungle, +/area/wizard_station) "Wl" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/door_control/no_emag{ @@ -12593,6 +12865,12 @@ /obj/item/pen/blue, /turf/simulated/floor/wood, /area/centcom/control) +"Yo" = ( +/obj/structure/chair/comfy/purp{ + name = "wizard council throne" + }, +/turf/simulated/floor/carpet/red, +/area/wizard_station) "Yp" = ( /turf/simulated/floor/beach/water, /area/holodeck/source_beach) @@ -12644,6 +12922,10 @@ "YA" = ( /turf/simulated/wall/indestructible/riveted, /area/centcom/control) +"YB" = ( +/obj/item/flag/wiz, +/turf/simulated/floor/carpet/purple, +/area/wizard_station) "YC" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -12973,6 +13255,11 @@ "ZG" = ( /turf/simulated/wall/mineral/plastitanium, /area/shuttle/administration) +"ZH" = ( +/obj/structure/bookcase/random, +/obj/effect/decal/cleanable/cobweb, +/turf/simulated/floor/carpet/red, +/area/wizard_station) "ZJ" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/adv{ @@ -12989,6 +13276,10 @@ icon_state = "darkred" }, /area/centcom/specops) +"ZL" = ( +/obj/structure/showcase, +/turf/simulated/floor/wood, +/area/wizard_station) "ZN" = ( /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -13030,6 +13321,10 @@ "ZT" = ( /turf/simulated/wall/indestructible/riveted, /area/tdome/tdomeobserve) +"ZU" = ( +/obj/structure/bookcase/random, +/turf/simulated/floor/carpet/red, +/area/wizard_station) "ZV" = ( /obj/structure/railing, /obj/structure/railing{ @@ -48801,10 +49096,10 @@ aN aN aN aN -aN -aN -aN -aN +ac +df +df +ac aN aN aN @@ -49058,10 +49353,10 @@ aN aN aN aN -aN -aN -aN -aN +ac +dU +dT +ac aN aN aN @@ -49313,12 +49608,12 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN +ac +at +ac +dh +dU +ac aN aN aN @@ -49570,12 +49865,12 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN +ac +aB +aB +aB +aB +ac aN aN aN @@ -49827,12 +50122,12 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN +ac +bz +aB +aB +aB +ac aN aN aN @@ -50084,12 +50379,12 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN +ac +aB +aB +aB +aB +ac aN aN aN @@ -50341,12 +50636,12 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN +ac +ac +ac +ac +ac +ac aN aN aN @@ -50598,15 +50893,15 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +fg +fg +fg +fg +fg +fg +fg +fg +fg aN aN aN @@ -50855,18 +51150,18 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +fg +cY +cY +di +dV +ee +ee +eY +fg +fg +fg +fg aN aN aN @@ -51112,18 +51407,18 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +ae +bN +bN +bN +da +da +da +da +fi +fu +fu +fg aN aN aN @@ -51369,18 +51664,18 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +ae +bO +bN +du +dW +da +da +da +fj +fu +fu +fg aN aN aN @@ -51626,18 +51921,18 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +ae +bR +bN +dw +dW +da +da +da +fj +fu +fu +fg aN aN aN @@ -51883,18 +52178,18 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +ae +bR +bN +dx +dW +da +da +da +fi +fu +fu +fg aN aN aN @@ -52140,18 +52435,18 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +fg +bY +bN +dy +dW +da +da +db +fg +fg +fg +fg aN aN aN @@ -52397,15 +52692,15 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +fg +ci +cZ +dz +dW +da +ey +eZ +fg aN aN aN @@ -52654,15 +52949,15 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +fg +co +da +da +da +da +da +fa +fg aN aN aN @@ -52911,15 +53206,15 @@ aN aN aN aN -aN -ac -df -df -ac -aN -aN -aN -aN +fg +cs +da +da +da +da +da +db +fg aN aN aN @@ -53168,15 +53463,15 @@ aN aN aN aN -aN -ac -dU -dT -ac -aN -aN -aN -aN +fg +ct +da +da +da +da +ey +eZ +fg aN aN aN @@ -53424,16 +53719,16 @@ aN aN aN aN -ac -at -ac -dh -dU -ac -aN -aN -aN aN +fg +cv +db +da +da +da +da +db +fg aN aN aN @@ -53681,16 +53976,16 @@ aN aN aN aN -ac -aB -aB -aB -aB -ac -aN -aN -aN aN +fg +cy +cy +cy +cy +eh +ez +fb +fg aN aN aN @@ -53938,16 +54233,16 @@ aN aN aN aN -ac -bz -aB -aB -aB -ac -aN -aN -aN aN +fg +cz +cy +cy +cy +cy +eE +fc +fg aN aN aN @@ -54195,16 +54490,16 @@ aN aN aN aN -ac -aB -aB -aB -aB -ac -aN -aN -aN aN +fg +cy +cy +dE +cy +cy +eE +fc +fg aN aN aN @@ -54452,16 +54747,16 @@ aN aN aN aN -ac -ac -ac -ac -ac -ac -aN -aN -aN aN +ag +cy +dc +cy +dX +cy +eE +fc +fg aN aN aN @@ -54709,16 +55004,16 @@ aN aN aN aN -fg -fg -fg -fg -fg -fg -fg -fg -fg aN +fg +cy +cy +dF +cy +cy +eF +fc +fg aN aN aN @@ -54966,17 +55261,15 @@ aN aN aN aN +aN fg -cY -cY -di -dV -ee -ee -eY -fg -fg -fg +cG +cy +cz +cy +cy +eE +fe fg aN aN @@ -55064,6 +55357,8 @@ aN aN aN aN +aN +aN DH De De @@ -55223,18 +55518,18 @@ aN aN aN aN -ae -bN -bN -bN -da -da -da -da -fi -fu -fu +aN fg +fg +fg +fg +fg +fg +fg +fg +fg +aN +aN aN aN aN @@ -55480,18 +55775,18 @@ aN aN aN aN -ae -bO -bN -du -dW -da -da -da -fj -fu -fu -fg +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -55737,18 +56032,18 @@ aN aN aN aN -ae -bR -bN -dw -dW -da -da -da -fj -fu -fu -fg +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -55994,18 +56289,18 @@ aN aN aN aN -ae -bR -bN -dx -dW -da -da -da -fi -fu -fu -fg +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -56251,18 +56546,18 @@ aN aN aN aN -fg -bY -bN -dy -dW -da -da -db -fg -fg -fg -fg +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -56508,15 +56803,15 @@ aN aN aN aN -fg -ci -cZ -dz -dW -da -ey -eZ -fg +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -56765,15 +57060,15 @@ aN aN aN aN -fg -co -da -da -da -da -da -fa -fg +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -57022,15 +57317,15 @@ aN aN aN aN -fg -cs -da -da -da -da -da -db -fg +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -57279,15 +57574,15 @@ aN aN aN aN -fg -ct -da -da -da -da -ey -eZ -fg +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -57536,25 +57831,25 @@ aN aN aN aN -fg -cv -db -da -da -da -da -db -fg -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -57793,25 +58088,25 @@ aN aN aN aN -fg -cy -cy -cy -cy -eh -ez -fb -fg -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -58050,25 +58345,25 @@ aN aN aN aN -fg -cz -cy -cy -cy -cy -eE -fc -fg -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +BX +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -58307,25 +58602,25 @@ aN aN aN aN -fg -cy -cy -dE -cy -cy -eE -fc -fg -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +BX +BX +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -58564,25 +58859,25 @@ aN aN aN aN -ag -cy -dc -cy -dX -cy -eE -fc -fg -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +BX +BX +UJ +UJ +UJ +UJ +BX +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -58815,31 +59110,31 @@ aN "} (179,1,1) = {" aN -aN -aN -aN -aN -aN -aN -fg -cy -cy -dF -cy -cy -eF -fc -fg -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +BX +BX +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -59072,36 +59367,36 @@ aN "} (180,1,1) = {" aN -aN -aN -aN -aN -aN -aN -fg -cG -cy -cz -cy -cy -eE -fe -fg -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +xH +xH +GN +GN +xH +xH +xH +xH +xH +xH +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -59329,38 +59624,38 @@ aN "} (181,1,1) = {" aN -aN -aN -aN -aN -aN -aN -fg -fg -fg -fg -fg -fg -fg -fg -fg -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +xH +ZL +ed +ed +GG +GN +Ue +RT +yx +xH +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -59586,39 +59881,39 @@ aN "} (182,1,1) = {" aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +BX +BX +UJ +GN +Rt +fx +ed +ed +GN +xo +Hj +Ue +xH +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -59843,39 +60138,39 @@ aN "} (183,1,1) = {" aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +BX +UJ +UJ +UJ +UJ +UJ +BX +BX +UJ +GN +BR +fz +ed +fx +GN +Ue +Wk +Qy +xH +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -60100,39 +60395,39 @@ aN "} (184,1,1) = {" aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +BX +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +xH +hy +ed +ed +Gj +GN +yx +Ee +Ue +xH +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -60357,39 +60652,39 @@ aN "} (185,1,1) = {" aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +BX +UJ +xH +xH +xH +xH +xH +xH +UJ +xH +iO +ed +ed +MU +GN +sl +Lu +Wk +xH +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -60614,39 +60909,39 @@ aN "} (186,1,1) = {" aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +BX +UJ +GN +Ba +Ou +Uc +xO +xH +xH +xH +FN +ed +ed +ga +xH +xH +xH +xH +xH +xH +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -60871,39 +61166,39 @@ aN "} (187,1,1) = {" aN -aN -aN -aN -aN -aN -aN -ai -ai -ai -ai -ai -ai -ai -ai -ai -ai -ai -ai -ai -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +xH +so +Ln +Ln +Ln +pH +OL +xH +CY +ed +ed +zv +xH +xH +ZH +ZU +ZU +xH +xH +xH +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -61128,39 +61423,39 @@ aN "} (188,1,1) = {" aN -aN -aN -aN -aN -aN -aN -ai +UJ +UJ +UJ +UJ +UJ +UJ +xH cH -cN -dN -cN +Ln +Ln +Ln ej -cN -ff -fk -fv -fA +VX +xH +xH fv +ed +ed ai -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +qu +qu +qu +qu +qu +qu +xH +xH +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -61385,39 +61680,39 @@ aN "} (189,1,1) = {" aN -aN -aN -aN -aN -aN -aN -ai +UJ +UJ +UJ +UJ +UJ +UJ +GN cK -cN -dN -cN -ej -cN -cN -fk +Ln +Ln +yp +Ln +Vx +xH +xH fw -fw -fB +ed +ed ai -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Yo +jb +jN +FH +CU +qu +ZU +xH +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -61642,39 +61937,39 @@ aN "} (190,1,1) = {" aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +xH +xH +xH +Qn +xH +xH +xH +xH +xH +Qj +ed +ed ai -cN -cN -cN -cN -cN -cN -cN -fk -fk -fk -fk -ai -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Yo +LT +Bb +aZ +CU +qu +ZU +xH +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -61899,39 +62194,39 @@ aN "} (191,1,1) = {" aN -aN -aN -aN -aN -aN -aN -ai +UJ +UJ +UJ +UJ +UJ +UJ +xH cP -cN -cN -cN +RA +eo +YB en -en -cN +xH +fX fn cN -cN -ff +ed +ed ai -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Yo +Aj +pm +kJ +CU +qu +ZU +xH +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -62156,39 +62451,39 @@ aN "} (192,1,1) = {" aN -aN -aN -aN -aN -aN -aN -ai +UJ +UJ +UJ +UJ +UJ +UJ +xH cS -cN -cN +Lv +eo ec eo eO -fh -cN -cN -cN -fC +ed +ed +ed +ed +ed ai -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Yo +FQ +jL +Ak +CU +qu +ZU +xH +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -62413,39 +62708,39 @@ aN "} (193,1,1) = {" aN -aN -aN -aN -aN -aN -aN -ai +UJ +UJ +UJ +UJ +UJ +BX +xH cU -cN -dP -ec -ep -eP -fh -cN -cN -cN -cN +eo +eo +eo +eo +eO +ed +ed +ed +ed +MV ai -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +qu +qu +qu +qu +qu +sX +xH +xH +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -62670,39 +62965,39 @@ aN "} (194,1,1) = {" aN -aN -aN -aN -aN -aN -aN -ai -ai -cN -ai -ai -ai -ai -ai -fo -ed -ed -fD -ai -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +BX +BX +BX +xH +gB +QU +eo +Gv +pp +xH +xH +GN +GN +GN +xH +xH +xH +ZU +Os +ZU +xH +xH +xH +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -62927,39 +63222,39 @@ aN "} (195,1,1) = {" aN -aN -aN -aN -aN -aN -aN -ai -cV -dd -dQ -ai -eu -eR -ai -fp -fx -ed -ed -ai -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +xH +xH +xH +GN +xH +xH +xH +UJ +BX +BX +BX +BX +UJ +xH +xH +xH +xH +xH +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -63184,39 +63479,39 @@ aN "} (196,1,1) = {" aN -aN -aN -aN -aN -aN -aN -ai -cW -de -dd -ed -ed -ed -ai -fp -fz -ed -fx -ai -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +BX +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -63441,39 +63736,39 @@ aN "} (197,1,1) = {" aN -aN -aN -aN -aN -aN -aN -ai -cX -dd -dR -ai -ew -eT -ai -fq -ed -ed -fG -ai -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +BX +BX +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -63698,39 +63993,39 @@ aN "} (198,1,1) = {" aN -aN -aN -aN -aN -aN -aN -ai -ai -ai -ai -ai -ai -ai -ai -ai -ai -ai -ai -ai -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +BX +BX +BX +UJ +UJ +UJ +Vf +BX +BX +UJ +UJ +UJ +UJ +UJ +BX +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -63955,39 +64250,39 @@ aN "} (199,1,1) = {" aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +BX +UJ +UJ +UJ +UJ +UJ +UJ +BX +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -64212,38 +64507,38 @@ aN "} (200,1,1) = {" aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN @@ -64469,36 +64764,36 @@ aN "} (201,1,1) = {" aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ +UJ aN aN aN diff --git a/code/game/area/ss13_areas.dm b/code/game/area/ss13_areas.dm index 6de5a8c16f0..22476e93f64 100644 --- a/code/game/area/ss13_areas.dm +++ b/code/game/area/ss13_areas.dm @@ -529,7 +529,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Wizard's Den" icon_state = "yellow" requires_power = FALSE - dynamic_lighting = DYNAMIC_LIGHTING_DISABLED + dynamic_lighting = DYNAMIC_LIGHTING_FORCED /area/ninja name = "\improper Ninja Area Parent" diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 508f39ef5f0..c3d4c366d0e 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -126,6 +126,21 @@ return FALSE +/obj/item/candle/eternal/wizard + desc = "A candle. It smells like magic, so that would explain why it burns brighter." + start_lit = TRUE + +/obj/item/candle/eternal/wizard/attack_self(mob/user) + return + +/obj/item/candle/eternal/wizard/process() + return + +/obj/item/candle/eternal/wizard/light(show_message) + . = ..() + if(lit) + set_light(CANDLE_LUM * 2) + #undef TALL_CANDLE #undef MID_CANDLE #undef SHORT_CANDLE diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 623bd5234fd..e40a38af137 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -10,14 +10,20 @@ close_sound_volume = 50 max_integrity = 70 -/obj/structure/closet/cabinet/update_icon_state() - if(!opened) - icon_state = icon_closed - else - icon_state = icon_opened +/obj/structure/closet/cabinet/wizard + name = "magical cabinet" -/obj/structure/closet/cabinet/update_overlays() - return list() +/obj/structure/closet/cabinet/wizard/populate_contents() + new /obj/item/clothing/shoes/sandal(src) + new /obj/item/clothing/shoes/sandal(src) + new /obj/item/clothing/suit/wizrobe(src) + new /obj/item/clothing/head/wizard(src) + new /obj/item/clothing/suit/wizrobe/red(src) + new /obj/item/storage/backpack/satchel(src) + new /obj/item/storage/backpack/satchel(src) + new /obj/item/clothing/head/wizard/red(src) + new /obj/item/clothing/under/color/purple(src) + new /obj/item/clothing/under/color/lightpurple(src) /obj/structure/closet/acloset name = "strange closet" diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm index 8fd29321eeb..0a3386ef45c 100644 --- a/code/game/turfs/simulated/walls_indestructible.dm +++ b/code/game/turfs/simulated/walls_indestructible.dm @@ -150,6 +150,13 @@ underlays += mutable_appearance('icons/obj/structures.dmi', "grille") //add a grille underlay underlays += mutable_appearance('icons/turf/floors.dmi', "plating") //add the plating underlay, below the grille +/turf/simulated/wall/indestructible/fakeglass/brass + icon = 'icons/obj/smooth_structures/clockwork_window.dmi' + icon_state = "clockwork_window-0" + base_icon_state = "clockwork_window" + smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE_BRASS) + canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_BRASS) + /turf/simulated/wall/indestructible/opsglass name = "window" icon = 'icons/obj/smooth_structures/plastitanium_window.dmi'