diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index cbf09b90de6..a931e8f699a 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -3209,6 +3209,12 @@ }, /turf/simulated/floor/plasteel/dark, /area/ghost_bar) +"lk" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/admin) "lm" = ( /obj/structure/chair/office/dark, /turf/simulated/floor/plasteel/dark, @@ -4263,21 +4269,14 @@ /turf/simulated/floor/grass/jungle, /area/centcom/evac) "oi" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "ADMINLOCKDOWN"; - name = "Security Doors"; - opacity = 0 - }, -/turf/simulated/floor/plasteel, +/obj/item/gun/magic/wand/death/debug, +/obj/structure/table/wood/fancy/purple, +/turf/simulated/floor/carpet, /area/admin) "oj" = ( -/obj/machinery/door/airlock/hatch{ - name = "External Airlock" - }, -/turf/simulated/floor/plasteel, +/obj/item/clothing/glasses/hud/debug, +/obj/structure/table/wood/fancy/royalblack, +/turf/simulated/floor/carpet/royalblack, /area/admin) "ol" = ( /obj/structure/chair/comfy/black{ @@ -6787,7 +6786,12 @@ /turf/simulated/floor/plasteel/freezer, /area/admin) "wZ" = ( -/turf/simulated/floor/wood, +/obj/structure/table/wood/fancy/purple, +/obj/item/spellbook{ + uses = 250; + name = "admin spell book" + }, +/turf/simulated/floor/carpet, /area/admin) "xa" = ( /obj/structure/toilet{ @@ -6932,8 +6936,9 @@ /turf/simulated/wall/indestructible/fakeglass, /area/centcom/suppy) "xK" = ( -/obj/structure/chair/comfy/black, -/turf/simulated/floor/wood, +/obj/item/gun/magic/wand/resurrection/debug, +/obj/structure/table/wood/fancy/purple, +/turf/simulated/floor/carpet, /area/admin) "xM" = ( /obj/machinery/computer/shuttle/admin{ @@ -7032,6 +7037,11 @@ }, /turf/simulated/floor/wood, /area/centcom/control) +"yj" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/item/gun/projectile/automatic/pistol, +/turf/simulated/floor/carpet/royalblack, +/area/admin) "yk" = ( /obj/machinery/economy/vending/shoedispenser, /obj/machinery/light/small{ @@ -7212,6 +7222,11 @@ }, /turf/simulated/floor/mineral/titanium, /area/shuttle/transport) +"zu" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/item/gun/projectile/revolver, +/turf/simulated/floor/carpet/royalblack, +/area/admin) "zv" = ( /obj/item/flag/wiz, /turf/simulated/floor/wood, @@ -7278,10 +7293,10 @@ /area/ghost_bar) "zM" = ( /obj/machinery/door/airlock/hatch{ - desc = "For all your shady business needs"; - name = "Gambling Den" + desc = "You've heard rumors of the horrors that go on within this lab."; + name = "Debug Room" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/plasteel/dark, /area/admin) "zN" = ( /obj/machinery/computer/cryopod/robot, @@ -7329,13 +7344,17 @@ /turf/simulated/floor/plasteel/dark, /area/admin) "Ac" = ( -/obj/structure/table/wood, -/turf/simulated/floor/wood, +/obj/structure/table/wood/fancy/royalblack, +/obj/item/radio/uplink/admin{ + name = "admin uplink" + }, +/turf/simulated/floor/carpet/royalblack, /area/admin) "Ad" = ( -/obj/structure/table/wood, -/obj/item/deck/cards/syndicate, -/turf/simulated/floor/wood, +/obj/structure/table/wood/fancy/royalblack, +/obj/item/soap/syndie/debug, +/obj/item/reagent_containers/spray/cleaner/advanced/debug, +/turf/simulated/floor/carpet/royalblack, /area/admin) "Ae" = ( /obj/structure/table/wood, @@ -7450,9 +7469,9 @@ /turf/simulated/floor/plasteel, /area/admin) "As" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/drinks/drinkingglass/devilskiss, -/turf/simulated/floor/wood, +/obj/item/bodyanalyzer/debug, +/obj/structure/table/wood/fancy/royalblack, +/turf/simulated/floor/carpet/royalblack, /area/admin) "At" = ( /obj/structure/chair/comfy/black{ @@ -7461,14 +7480,16 @@ /turf/simulated/floor/plasteel, /area/admin) "Au" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/royalblack, /area/admin) "Av" = ( -/obj/structure/table/wood, -/obj/item/lighter/zippo/engraved, -/obj/item/storage/fancy/cigarettes/dromedaryco, -/turf/simulated/floor/wood, +/obj/structure/table/wood/fancy/royalblack, +/obj/item/melee/energy/sword, +/obj/item/melee/energy/sword{ + pixel_x = -5; + pixel_y = 5 + }, +/turf/simulated/floor/carpet/royalblack, /area/admin) "Aw" = ( /obj/machinery/computer/communications{ @@ -8453,6 +8474,11 @@ }, /turf/simulated/floor/wood, /area/trader_station/sol) +"Ed" = ( +/obj/structure/table/wood/fancy/royalblue, +/obj/item/reagent_containers/drinks/cans/adminbooze, +/turf/simulated/floor/plasteel, +/area/admin) "Ee" = ( /obj/structure/flora/rock/pile/largejungle, /turf/simulated/floor/grass/jungle, @@ -9501,6 +9527,13 @@ icon_state = "vault" }, /area/centcom/specops) +"HS" = ( +/obj/structure/table/wood/fancy/purple, +/obj/item/clothing/shoes/sandal/magic, +/obj/item/clothing/suit/wizrobe, +/obj/item/clothing/head/wizard, +/turf/simulated/floor/carpet, +/area/admin) "HT" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/ywflowers, @@ -9640,6 +9673,11 @@ /obj/effect/decal/cleanable/ants, /turf/simulated/floor/plasteel/dark, /area/centcom/control) +"It" = ( +/obj/structure/table/wood/fancy/purple, +/obj/item/reagent_containers/drinks/mugwort, +/turf/simulated/floor/carpet, +/area/admin) "Iu" = ( /obj/structure/table/reinforced, /obj/item/storage/box/donkpockets, @@ -9726,6 +9764,11 @@ /obj/structure/railing, /turf/simulated/floor/grass, /area/centcom/evac) +"IJ" = ( +/obj/item/debug/human_spawner, +/obj/structure/table/wood/fancy/purple, +/turf/simulated/floor/carpet, +/area/admin) "IK" = ( /obj/structure/table/holotable, /obj/item/clothing/head/helmet/thunderdome, @@ -9925,6 +9968,11 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/centcom/specops) +"Js" = ( +/obj/structure/table/wood/fancy/purple, +/obj/item/gun/magic/staff, +/turf/simulated/floor/carpet, +/area/admin) "Jt" = ( /obj/structure/railing{ dir = 6 @@ -30308,9 +30356,9 @@ aN aN aN YA -YN -YN -YN +sm +sm +sm YA Te JD @@ -30564,7 +30612,7 @@ aN aN aN aN -YN +sm EW Gd GR @@ -30821,7 +30869,7 @@ aN aN aN aN -YN +sm vt vt vt @@ -31078,7 +31126,7 @@ aN aN aN aN -YN +sm vt vt vt @@ -31335,7 +31383,7 @@ aN aN aN aN -YN +sm EZ Ge vt @@ -67803,11 +67851,11 @@ aN aN aN aN -wk -wk -oi -wk -wk +aN +aN +aN +aN +aN aN aN aN @@ -68061,9 +68109,9 @@ aN wk aN aN -wk -lZ -wk +aN +aN +aN aN aN aN @@ -68318,10 +68366,10 @@ lH wk wk wk -wk -oj -wk -wk +aN +aN +aN +aN aN aN aN @@ -68575,8 +68623,8 @@ mx mU nm wk -wk -lZ +lH +lH wk wk lH @@ -68832,8 +68880,8 @@ lZ lZ nq wk -lZ -lZ +Ed +lk wk qL lZ @@ -74757,7 +74805,7 @@ wk wk lZ lZ -wk +lZ wk wk wk @@ -75008,13 +75056,13 @@ wk wk lH lH -lH +wk wk wk wk zM zM -wk +zM wk wk wk @@ -75265,17 +75313,17 @@ aN aN aN aN -aN -aN wk +oi +xK +IJ +uz +vK +Au +oj +As +Ad wk -wZ -wZ -wk -wk -aN -aN -aN aN aN aN @@ -75522,17 +75570,17 @@ aN aN aN aN -aN -aN -aN -lH -wZ -wZ wk -aN -aN -aN -aN +uz +uz +uz +uz +vK +Au +Au +Au +Au +wk aN aN aN @@ -75779,17 +75827,17 @@ aN aN aN aN -aN -aN -wk -wk -wZ -wZ -wk -wk -aN -aN -aN +lH +uz +uz +uz +uz +vK +Au +Au +Au +Au +lH aN aN aN @@ -76036,17 +76084,17 @@ aN aN aN aN -aN wk +uz +uz +uz +uz +vK +Au +Au +Au +Au wk -wk -wZ -wZ -wk -wk -wk -aN -aN aN aN aN @@ -76294,16 +76342,16 @@ aN aN aN wk +uz +uz +uz +uz +vK +Au +Au +Au +Au wk -wk -wZ -wZ -wZ -wZ -wk -wk -wk -aN aN aN aN @@ -76551,16 +76599,16 @@ aN aN aN wk -wk -wZ -wZ -wZ +uz +uz +uz +uz +vK +Au +Au +Au Au -wZ -wZ wk -wk -aN aN aN aN @@ -76808,14 +76856,15 @@ aN aN aN lH -wZ -wZ -wZ -Ac -Av +HS +uz +uz +uz +vK Au -wZ -wZ +Au +Au +zu lH aN aN @@ -76948,7 +76997,6 @@ aN aN aN aN -aN "} (243,1,1) = {" aa @@ -77064,17 +77112,17 @@ aN aN aN aN -lH -wZ -wZ -xK -Ad -Ac +wk +Js +uz +uz +uz +vK Au -wZ -wZ -lH -aN +Au +Au +yj +wk aN aN aN @@ -77321,17 +77369,17 @@ aN aN aN aN -lH +wk +It wZ -wZ -wZ -As -Ac +uz +uz +vK Au -wZ -wZ -lH -aN +Au +Ac +Av +wk aN aN aN @@ -77580,15 +77628,15 @@ aN aN wk wk -wZ -wZ -wZ -Au -wZ -wZ +wk +lH +wk +wk +wk +lH +wk wk wk -aN aN aN aN @@ -77835,16 +77883,16 @@ aN aN aN aN -wk -wk -wk -wZ -wZ -wZ -wZ -wk -wk -wk +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -78093,14 +78141,14 @@ aN aN aN aN -wk -wk -wk -wZ -wZ -wk -wk -wk +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -78351,12 +78399,12 @@ aN aN aN aN -wk -wk -lH -lH -wk -wk +aN +aN +aN +aN +aN +aN aN aN aN diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 8197a9f9055..6aa34a1d3b3 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -33,7 +33,6 @@ var/newscaster_announcements = null var/ert_disabled = FALSE var/uplink_welcome = "Syndicate Uplink Console:" - var/uplink_uses = 100 var/list/player_draft_log = list() var/list/datum/mind/xenos = list() diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 1208b3d5478..522ee656d72 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -17,7 +17,7 @@ GLOBAL_LIST_EMPTY(world_uplinks) var/list/uplink_items var/purchase_log = "" - var/uplink_owner = null//text-only + var/uplink_owner = null //text-only var/used_TC = 0 var/job = null @@ -36,7 +36,7 @@ GLOBAL_LIST_EMPTY(world_uplinks) /obj/item/uplink/New() ..() - uses = SSticker.mode.uplink_uses + uses = 100 uplink_items = get_uplink_items(src) GLOB.world_uplinks += src