diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 2a6077a48d..8fb6f919ff 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -65,6 +65,33 @@ }, /turf/open/floor/plasteel, /area/security/office) +"aai" = ( +/obj/structure/table/wood, +/obj/item/folder/red, +/obj/item/stamp/hos, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/carpet, +/area/command/heads_quarters/hos) +"aaj" = ( +/obj/structure/table/reinforced, +/obj/item/storage/fancy/donut_box, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/plasteel, +/area/command/bridge) +"aak" = ( +/obj/structure/table/wood, +/obj/item/folder/blue, +/obj/item/stamp/captain, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/wood, +/area/command/heads_quarters/captain) +"aal" = ( +/obj/structure/table, +/obj/machinery/recharger, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/plasteel, +/area/command/heads_quarters/hop) "aam" = ( /obj/effect/turf_decal/tile/green{ dir = 8 @@ -1265,12 +1292,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/security/office) -"acQ" = ( -/obj/structure/table/wood, -/obj/item/folder/red, -/obj/item/stamp/hos, -/turf/open/floor/carpet, -/area/command/heads_quarters/hos) "acR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/spawner/structure/window/reinforced, @@ -18255,11 +18276,6 @@ }, /turf/open/floor/plasteel, /area/command/bridge) -"aSE" = ( -/obj/structure/table/reinforced, -/obj/item/storage/fancy/donut_box, -/turf/open/floor/plasteel, -/area/command/bridge) "aSF" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -23256,13 +23272,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/command/heads_quarters/captain) -"bfB" = ( -/obj/structure/table/wood, -/obj/item/folder/blue, -/obj/item/stamp/captain, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, -/area/command/heads_quarters/captain) "bfC" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green, @@ -30235,11 +30244,6 @@ }, /turf/open/floor/plasteel, /area/command/heads_quarters/hop) -"bwk" = ( -/obj/structure/table, -/obj/machinery/recharger, -/turf/open/floor/plasteel, -/area/command/heads_quarters/hop) "bwl" = ( /obj/structure/cable{ icon_state = "1-2" @@ -93760,7 +93764,7 @@ bqB unQ btD buO -bwk +aal bmr aLY cBw @@ -97336,7 +97340,7 @@ aJq aOE aPX aRs -aSE +aaj aUc aVm aWY @@ -97860,7 +97864,7 @@ baf bdk mRQ bek -bfB +aak vde bdk bjF @@ -99603,7 +99607,7 @@ aaf aaL adO acr -acQ +aai adn agw abq diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm index e871b0145c..75a24fe468 100644 --- a/_maps/map_files/CogStation/CogStation.dmm +++ b/_maps/map_files/CogStation/CogStation.dmm @@ -1325,6 +1325,17 @@ "adi" = ( /turf/open/floor/plasteel, /area/commons/lounge) +"adj" = ( +/obj/structure/table/reinforced, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, +/obj/item/folder/red, +/obj/item/stamp/hos, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/plasteel/grimy, +/area/command/heads_quarters/hos) "adk" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -1470,6 +1481,15 @@ /obj/machinery/syndicatebomb/training, /turf/open/floor/plasteel, /area/security/brig) +"adF" = ( +/obj/structure/table/wood, +/obj/item/storage/fancy/donut_box, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/carpet/royalblue, +/area/command/bridge) "adG" = ( /obj/machinery/mass_driver/pressure_plate{ id = "hydro_in" @@ -1598,6 +1618,22 @@ }, /turf/open/floor/plasteel/dark, /area/science/observatory) +"adY" = ( +/obj/structure/table/wood, +/obj/machinery/recharger, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/button/door{ + id = "capblast"; + name = "Window Blast Door Control"; + pixel_x = -6; + pixel_y = -3; + req_access_txt = "19" + }, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/carpet/blue, +/area/command/heads_quarters/captain) "adZ" = ( /turf/open/floor/plating, /area/tcommsat/computer) @@ -1761,6 +1797,12 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"aeu" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/carpet/green, +/area/command/heads_quarters/hop) "aev" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 @@ -15496,16 +15538,6 @@ }, /turf/open/floor/plasteel, /area/security/office) -"aIr" = ( -/obj/structure/table/reinforced, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/obj/item/folder/red, -/obj/item/stamp/hos, -/turf/open/floor/plasteel/grimy, -/area/command/heads_quarters/hos) "aIs" = ( /obj/machinery/light{ dir = 4; @@ -16677,14 +16709,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port/fore) -"aKE" = ( -/obj/structure/table/wood, -/obj/item/storage/fancy/donut_box, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/carpet/royalblue, -/area/command/bridge) "aKF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -21221,11 +21245,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, /area/commons/locker) -"aUB" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp, -/turf/open/floor/carpet/green, -/area/command/heads_quarters/hop) "aUC" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 @@ -33253,21 +33272,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plating, /area/maintenance/department/chapel) -"buM" = ( -/obj/structure/table/wood, -/obj/machinery/recharger, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/button/door{ - id = "capblast"; - name = "Window Blast Door Control"; - pixel_x = -6; - pixel_y = -3; - req_access_txt = "19" - }, -/turf/open/floor/carpet/blue, -/area/command/heads_quarters/captain) "buN" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, @@ -90044,7 +90048,7 @@ cQQ aHF aIH aJz -aKE +adF aLI aMX aIE @@ -91079,7 +91083,7 @@ aSW aHM biF aQW -buM +adY bAX bEN bOL @@ -92365,7 +92369,7 @@ aNR bly bjF byd -aUB +aeu bKK aaa bdg @@ -93125,7 +93129,7 @@ aZT aGv bLp bEV -aIr +adj aFj aOs aIP diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index bda94c1a2c..5a56881764 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -15,6 +15,55 @@ /obj/structure/lattice, /turf/open/space, /area/space/nearstation) +"aae" = ( +/obj/structure/table/wood, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/item/folder/red, +/obj/item/stamp/hos, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/plasteel/grimy, +/area/command/heads_quarters/hos) +"aaf" = ( +/obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 4 + }, +/obj/item/wrench, +/obj/item/assembly/timer, +/obj/item/assembly/signaler, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/plasteel/dark, +/area/command/bridge) +"aag" = ( +/obj/structure/table/wood, +/obj/item/storage/fancy/donut_box, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/plasteel/grimy, +/area/command/heads_quarters/captain) +"aah" = ( +/obj/structure/table/wood, +/obj/machinery/recharger, +/obj/machinery/newscaster{ + pixel_x = 32 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/wood, +/area/command/heads_quarters/hop) "aar" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -87346,15 +87395,6 @@ heat_capacity = 1e+006 }, /area/commons/locker) -"jBm" = ( -/obj/structure/table/wood, -/obj/machinery/recharger, -/obj/machinery/newscaster{ - pixel_x = 32 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/wood, -/area/command/heads_quarters/hop) "jBx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -90500,24 +90540,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/service/hydroponics) -"kCc" = ( -/obj/structure/table/wood, -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/obj/item/folder/red, -/obj/item/stamp/hos, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/white{ - icon_state = "2-8" - }, -/obj/structure/cable/white{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel/grimy, -/area/command/heads_quarters/hos) "kCj" = ( /obj/machinery/door/poddoor/shutters{ id = "evashutters"; @@ -117734,19 +117756,6 @@ }, /turf/open/floor/plasteel, /area/commons/locker) -"udG" = ( -/obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 4 - }, -/obj/item/wrench, -/obj/item/assembly/timer, -/obj/item/assembly/signaler, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/command/bridge) "udJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -122369,11 +122378,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/cargo/miningoffice) -"vUv" = ( -/obj/structure/table/wood, -/obj/item/storage/fancy/donut_box, -/turf/open/floor/plasteel/grimy, -/area/command/heads_quarters/captain) "vVx" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -165904,7 +165908,7 @@ xFw haQ fFZ lvC -jBm +aah gXP iBI gfo @@ -169227,7 +169231,7 @@ buq aaa vzr rkQ -udG +aaf uAg xHY oEz @@ -171290,7 +171294,7 @@ nUj fkl hDk ppc -vUv +aag jRl idi hDk @@ -184126,7 +184130,7 @@ wNr tbd smD uTY -kCc +aae uTc uKG qOF diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm index 223dc466e4..bd20b2edc8 100644 --- a/_maps/map_files/LambdaStation/lambda.dmm +++ b/_maps/map_files/LambdaStation/lambda.dmm @@ -739,6 +739,20 @@ }, /turf/open/floor/plasteel, /area/science/mixing) +"acd" = ( +/obj/structure/table/wood, +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/cigbutt/cigarbutt{ + pixel_x = 5; + pixel_y = -1 + }, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/carpet, +/area/command/heads_quarters/hos) "ace" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -15297,19 +15311,6 @@ }, /turf/open/floor/carpet, /area/command/heads_quarters/hos) -"aBy" = ( -/obj/structure/table/wood, -/obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/cigbutt/cigarbutt{ - pixel_x = 5; - pixel_y = -1 - }, -/turf/open/floor/carpet, -/area/command/heads_quarters/hos) "aBz" = ( /obj/machinery/computer/security/hos{ dir = 8 @@ -118937,7 +118938,7 @@ axF ayp azs cJu -aBy +acd aCu ayj aDX diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index c9763a151d..7c75dbfc2b 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -63,6 +63,12 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) +"aae" = ( +/obj/structure/table/wood, +/obj/item/stamp/hos, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/carpet, +/area/command/heads_quarters/hos) "aaf" = ( /obj/structure/lattice, /turf/open/space, @@ -72,6 +78,27 @@ /obj/structure/lattice, /turf/open/space, /area/space/nearstation) +"aah" = ( +/obj/item/folder/red{ + pixel_y = 3 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/item/folder/red{ + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/plasteel/dark, +/area/command/bridge) "aai" = ( /obj/structure/grille/broken, /obj/structure/lattice, @@ -81,6 +108,37 @@ /obj/structure/grille, /turf/open/space, /area/space/nearstation) +"aak" = ( +/obj/structure/table/wood, +/obj/item/folder/blue, +/obj/machinery/door/window{ + base_state = "right"; + icon_state = "right"; + name = "Captain's Desk"; + req_access_txt = "20" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/disposalpipe/segment, +/obj/item/stamp/captain, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/wood, +/area/command/heads_quarters/captain/private) +"aal" = ( +/obj/machinery/camera{ + c_tag = "Head of Personnel's Office"; + dir = 1 + }, +/obj/structure/table/wood, +/obj/item/storage/box/PDAs{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/box/silver_ids, +/obj/item/storage/box/ids, +/obj/machinery/light, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/wood, +/area/command/heads_quarters/hop) "aav" = ( /turf/open/space, /area/space/station_ruins) @@ -19878,21 +19936,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"bBW" = ( -/obj/machinery/camera{ - c_tag = "Head of Personnel's Office"; - dir = 1 - }, -/obj/structure/table/wood, -/obj/item/storage/box/PDAs{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/storage/box/silver_ids, -/obj/item/storage/box/ids, -/obj/machinery/light, -/turf/open/floor/wood, -/area/command/heads_quarters/hop) "bCe" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -54375,20 +54418,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/service/hydroponics) -"gMC" = ( -/obj/structure/table/wood, -/obj/item/folder/blue, -/obj/machinery/door/window{ - base_state = "right"; - icon_state = "right"; - name = "Captain's Desk"; - req_access_txt = "20" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment, -/obj/item/stamp/captain, -/turf/open/floor/wood, -/area/command/heads_quarters/captain/private) "gMW" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -57355,26 +57384,6 @@ /obj/structure/bookcase, /turf/open/floor/wood, /area/command/bridge) -"iwY" = ( -/obj/item/folder/red{ - pixel_y = 3 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/table/glass, -/obj/item/folder/red{ - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/command/bridge) "ixc" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -75243,11 +75252,6 @@ }, /turf/closed/wall, /area/command/bridge) -"slA" = ( -/obj/structure/table/wood, -/obj/item/stamp/hos, -/turf/open/floor/carpet, -/area/command/heads_quarters/hos) "smm" = ( /obj/machinery/shower{ dir = 4 @@ -110049,7 +110053,7 @@ pBK pBK poT nSn -bBW +aal pBK bzN bBB @@ -114668,7 +114672,7 @@ bci aaf myk xeF -iwY +aah pJi sKT uGy @@ -116425,7 +116429,7 @@ aaf fmY pHm uHd -slA +aae wcl eQY gWb @@ -116729,7 +116733,7 @@ xrJ vCg eAW fcg -gMC +aak hVY oxr ffN diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index cd1cdf83af..4c17a0ed49 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -846,6 +846,34 @@ /obj/effect/landmark/xmastree, /turf/open/floor/grass, /area/service/hydroponics/garden/monastery) +"aca" = ( +/obj/structure/table/wood, +/obj/item/phone, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/carpet, +/area/command/heads_quarters/hos) +"acb" = ( +/obj/machinery/status_display/evac{ + pixel_y = 32 + }, +/obj/item/folder/yellow{ + pixel_y = 4 + }, +/obj/structure/table/glass, +/obj/machinery/light{ + dir = 1; + light_color = "#e8eaff" + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/plasteel/dark, +/area/command/bridge) "acc" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -1924,6 +1952,11 @@ /obj/item/seeds/poppy, /turf/open/floor/plasteel/dark, /area/security/prison) +"aeI" = ( +/obj/structure/table/wood, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/carpet, +/area/command/heads_quarters/captain) "aeJ" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 @@ -1994,6 +2027,16 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAS) +"aeT" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green, +/obj/item/storage/secure/safe{ + pixel_x = -22; + pixel_y = 4 + }, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/wood, +/area/command/heads_quarters/hop) "aeU" = ( /obj/machinery/holopad, /turf/open/floor/plasteel/dark, @@ -3782,11 +3825,6 @@ }, /turf/open/floor/carpet, /area/command/heads_quarters/hos) -"ajX" = ( -/obj/structure/table/wood, -/obj/item/phone, -/turf/open/floor/carpet, -/area/command/heads_quarters/hos) "ajY" = ( /turf/open/floor/carpet, /area/command/heads_quarters/hos) @@ -6692,27 +6730,6 @@ }, /turf/open/floor/plasteel/dark, /area/command/bridge) -"arK" = ( -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, -/obj/item/folder/yellow{ - pixel_y = 4 - }, -/obj/structure/table/glass, -/obj/machinery/light{ - dir = 1; - light_color = "#e8eaff" - }, -/obj/item/pen, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/command/bridge) "arL" = ( /obj/machinery/computer/card, /obj/machinery/camera{ @@ -10385,10 +10402,6 @@ }, /turf/open/floor/carpet, /area/command/heads_quarters/captain) -"aAx" = ( -/obj/structure/table/wood, -/turf/open/floor/carpet, -/area/command/heads_quarters/captain) "aAy" = ( /obj/structure/table/wood, /obj/item/folder/blue, @@ -10823,15 +10836,6 @@ }, /turf/open/floor/plasteel/dark, /area/command/bridge) -"aBz" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green, -/obj/item/storage/secure/safe{ - pixel_x = -22; - pixel_y = 4 - }, -/turf/open/floor/wood, -/area/command/heads_quarters/hop) "aBA" = ( /obj/machinery/computer/security/telescreen/vault{ pixel_y = 30 @@ -89125,7 +89129,7 @@ anR aiq axC ajo -ajX +aca ckD cnV aow @@ -92484,7 +92488,7 @@ avP awW axV azb -aAx +aeI aBo aCB aDF @@ -94275,7 +94279,7 @@ aht aht abI aqJ -arK +acb asS atT auR @@ -96854,7 +96858,7 @@ lQQ ayf lQQ aAF -aBz +aeT aCP aDR aEL diff --git a/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt.dmm b/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt.dmm index 377b2e9c35..aeab3ca747 100644 --- a/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt.dmm +++ b/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt.dmm @@ -1,7 +1,257 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aaa" = ( +/obj/machinery/door/window/southleft{ + dir = 8; + name = "Kitchen Delivery"; + req_access_txt = "28" + }, +/obj/structure/window/reinforced, +/obj/effect/turf_decal/delivery, +/mob/living/simple_animal/hostile/retaliate/goat{ + name = "Pete" + }, +/turf/open/floor/plasteel, +/area/service/kitchen/coldroom) +"aab" = ( +/obj/structure/table, +/obj/item/storage/fancy/donut_box, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/plasteel/dark, +/area/maintenance/department/bridge) +"aac" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/bed/dogbed/ian, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/mob/living/simple_animal/pet/dog/corgi/Ian{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/command/heads_quarters/hop) +"aad" = ( +/obj/structure/table, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/carpet, +/area/command/heads_quarters/hop) +"aae" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/meson{ + pixel_y = 4 + }, +/obj/item/cartridge/atmos, +/obj/item/cartridge/engineering{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/cartridge/engineering{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/cartridge/engineering{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 27 + }, +/obj/machinery/keycard_auth{ + pixel_y = -28 + }, +/mob/living/simple_animal/parrot/Poly, +/turf/open/floor/plasteel, +/area/command/heads_quarters/ce) +"aaf" = ( +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/mob/living/simple_animal/sloth/paperwork, +/turf/open/floor/plasteel, +/area/cargo/storage) +"aag" = ( +/obj/structure/cable, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + dir = 8; + freq = 1400; + location = "QM #1" + }, +/obj/machinery/power/apc{ + areastring = "/area/maintenance/starboard"; + dir = 4; + name = "Starboard Maintenance APC"; + pixel_x = 26 + }, +/mob/living/simple_animal/bot/mulebot{ + beacon_freq = 1400; + home_destination = "QM #1"; + suffix = "#1" + }, +/turf/open/floor/pod/dark, +/area/cargo/sorting) +"aah" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + dir = 8; + freq = 1400; + location = "QM #2" + }, +/obj/machinery/camera{ + c_tag = "Cargo Garage"; + dir = 8 + }, +/mob/living/simple_animal/bot/mulebot{ + home_destination = "QM #2"; + suffix = "#2" + }, +/turf/open/floor/pod/dark, +/area/cargo/sorting) +"aai" = ( +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/obj/structure/sink/puddle, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/medical/genetics) +"aaj" = ( +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/ywflowers, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/medical/genetics) +"aak" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/flora/ausbushes/grassybush, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/medical/genetics) +"aal" = ( +/obj/structure/window/reinforced, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/ywflowers, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/medical/genetics) +"aam" = ( +/obj/structure/window/reinforced, +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/ausbushes/ywflowers, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/medical/genetics) +"aan" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/flora/ausbushes/brflowers, +/obj/machinery/door/window/westleft{ + dir = 2; + name = "Monkey Pen"; + req_access_txt = "9" + }, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/medical/genetics) "aao" = ( /turf/closed/mineral/random/snow, /area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) +"aap" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/mob/living/simple_animal/bot/medbot, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone3) +"aaq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/mob/living/simple_animal/bot/secbot{ + arrest_type = 1; + health = 45; + icon_state = "secbot1"; + idcheck = 1; + name = "Sergeant-at-Armsky"; + weaponscheck = 1 + }, +/turf/open/floor/plasteel, +/area/ai_monitored/security/armory) +"aar" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen/fountain, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/carpet/black, +/area/command/heads_quarters/hos) +"aas" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen{ + desc = "Writes upside down!"; + name = "astronaut pen" + }, +/obj/machinery/door/window{ + name = "Captain's Desk"; + req_access_txt = "20" + }, +/obj/machinery/door/firedoor/border_only{ + name = "south facing firelock" + }, +/obj/item/card/id/captains_spare, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/wood, +/area/command/heads_quarters/captain) +"aat" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/machinery/door/firedoor/border_only{ + dir = 4; + name = "east facing firelock" + }, +/obj/machinery/door/firedoor/border_only{ + name = "south facing firelock" + }, +/obj/item/flashlight/lamp, +/obj/item/storage/secure/briefcase/permits, +/turf/open/floor/plasteel/dark, +/area/command/bridge) "aaH" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -7597,13 +7847,6 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) -"ceZ" = ( -/mob/living/simple_animal/bot/medbot, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone3) "cfh" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green, @@ -12604,17 +12847,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) -"emd" = ( -/obj/effect/landmark/event_spawn, -/obj/structure/bed/dogbed/ian, -/mob/living/simple_animal/pet/dog/corgi/Ian{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/command/heads_quarters/hop) "emh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -13409,19 +13641,6 @@ }, /turf/open/floor/wood, /area/security/courtroom) -"eFU" = ( -/mob/living/carbon/monkey, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/flora/ausbushes/brflowers, -/obj/machinery/door/window/westleft{ - dir = 2; - name = "Monkey Pen"; - req_access_txt = "9" - }, -/turf/open/floor/grass, -/area/medical/genetics) "eGi" = ( /obj/structure/cable{ icon_state = "1-2" @@ -15046,24 +15265,6 @@ }, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) -"fpW" = ( -/obj/effect/turf_decal/bot, -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #2"; - suffix = "#2" - }, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - dir = 8; - freq = 1400; - location = "QM #2" - }, -/obj/machinery/camera{ - c_tag = "Cargo Garage"; - dir = 8 - }, -/turf/open/floor/pod/dark, -/area/cargo/sorting) "fqj" = ( /obj/structure/railing{ dir = 4 @@ -16694,11 +16895,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plasteel/cult, /area/service/library) -"gcc" = ( -/obj/structure/table, -/obj/item/storage/fancy/donut_box, -/turf/open/floor/plasteel/dark, -/area/maintenance/department/bridge) "gcp" = ( /obj/machinery/airalarm{ dir = 8; @@ -19692,12 +19888,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"hxr" = ( -/mob/living/carbon/monkey, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/grass, -/area/medical/genetics) "hxv" = ( /obj/structure/curtain, /obj/item/soap/deluxe, @@ -26508,27 +26698,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/checkpoint/auxiliary) -"kvG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/mob/living/simple_animal/bot/secbot{ - arrest_type = 1; - health = 45; - icon_state = "secbot1"; - idcheck = 1; - name = "Sergeant-at-Armsky"; - weaponscheck = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ai_monitored/security/armory) "kwk" = ( /obj/structure/chair{ dir = 1 @@ -30143,19 +30312,6 @@ /obj/structure/loot_pile/maint, /turf/open/floor/plating, /area/security/prison) -"miu" = ( -/mob/living/simple_animal/hostile/retaliate/goat{ - name = "Pete" - }, -/obj/machinery/door/window/southleft{ - dir = 8; - name = "Kitchen Delivery"; - req_access_txt = "28" - }, -/obj/structure/window/reinforced, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/service/kitchen/coldroom) "mjl" = ( /obj/machinery/light/small{ dir = 1 @@ -32503,14 +32659,6 @@ }, /turf/open/floor/plasteel, /area/cargo/sorting) -"noB" = ( -/obj/effect/turf_decal/bot, -/mob/living/simple_animal/sloth/paperwork, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/cargo/storage) "noG" = ( /obj/machinery/mecha_part_fabricator{ name = "counterfeit exosuit fabricator"; @@ -33276,31 +33424,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"nGa" = ( -/obj/structure/cable, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/mob/living/simple_animal/bot/mulebot{ - beacon_freq = 1400; - home_destination = "QM #1"; - suffix = "#1" - }, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - dir = 8; - freq = 1400; - location = "QM #1" - }, -/obj/machinery/power/apc{ - areastring = "/area/maintenance/starboard"; - dir = 4; - name = "Starboard Maintenance APC"; - pixel_x = 26 - }, -/turf/open/floor/pod/dark, -/area/cargo/sorting) "nGh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 1 @@ -34090,13 +34213,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/cargo/sorting) -"nXs" = ( -/mob/living/carbon/monkey, -/obj/structure/window/reinforced, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/grass, -/area/medical/genetics) "nXy" = ( /obj/structure/cable{ icon_state = "2-4" @@ -38456,23 +38572,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) -"pOg" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen{ - desc = "Writes upside down!"; - name = "astronaut pen" - }, -/obj/machinery/door/window{ - name = "Captain's Desk"; - req_access_txt = "20" - }, -/obj/machinery/door/firedoor/border_only{ - name = "south facing firelock" - }, -/obj/item/card/id/captains_spare, -/turf/open/floor/wood, -/area/command/heads_quarters/captain) "pOO" = ( /obj/structure/cable{ icon_state = "0-4" @@ -42601,35 +42700,6 @@ }, /turf/open/floor/plating, /area/construction) -"rFQ" = ( -/obj/structure/table/reinforced, -/mob/living/simple_animal/parrot/Poly, -/obj/item/clothing/glasses/meson{ - pixel_y = 4 - }, -/obj/item/cartridge/atmos, -/obj/item/cartridge/engineering{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/cartridge/engineering{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/cartridge/engineering{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 - }, -/obj/machinery/keycard_auth{ - pixel_y = -28 - }, -/turf/open/floor/plasteel, -/area/command/heads_quarters/ce) "rGc" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 @@ -43643,14 +43713,6 @@ }, /turf/open/floor/plasteel/white, /area/commons/dorms) -"shM" = ( -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/mob/living/carbon/monkey, -/obj/structure/sink/puddle, -/turf/open/floor/grass, -/area/medical/genetics) "shN" = ( /obj/structure/cable{ icon_state = "1-2" @@ -45457,17 +45519,6 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/maintenance/port/central) -"sXl" = ( -/obj/machinery/light{ - dir = 1 - }, -/mob/living/carbon/monkey, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/flora/ausbushes/grassybush, -/turf/open/floor/grass, -/area/medical/genetics) "sXs" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ @@ -47672,29 +47723,6 @@ "tXN" = ( /turf/closed/wall/r_wall, /area/science/robotics/lab) -"tXO" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/border_only{ - dir = 4; - name = "east facing firelock" - }, -/obj/machinery/door/firedoor/border_only{ - name = "south facing firelock" - }, -/obj/item/flashlight/lamp, -/turf/open/floor/plasteel/dark, -/area/command/bridge) "tXP" = ( /obj/machinery/light{ dir = 1 @@ -49165,13 +49193,6 @@ /obj/machinery/atmospherics/pipe/simple/yellow/visible/layer3, /turf/open/floor/plating, /area/engineering/atmospherics_engine) -"uKI" = ( -/mob/living/carbon/monkey, -/obj/structure/window/reinforced, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/grass, -/area/medical/genetics) "uKM" = ( /obj/item/kirbyplants/random, /obj/machinery/status_display/ai{ @@ -54447,18 +54468,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"xdr" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen/fountain, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 1 - }, -/turf/open/floor/carpet/black, -/area/command/heads_quarters/hos) "xdD" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 4 @@ -55742,10 +55751,6 @@ /obj/effect/turf_decal/trimline/yellow/filled, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) -"xJD" = ( -/obj/structure/table, -/turf/open/floor/carpet, -/area/command/heads_quarters/hop) "xJU" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, @@ -76443,8 +76448,8 @@ pZD tCp pBV nYZ -shM -nXs +aai +aal nRX jbE nmR @@ -76700,8 +76705,8 @@ mGe hIM pBV nYZ -hxr -uKI +aaj +aam vAp ouB nYZ @@ -76957,8 +76962,8 @@ uYp afq pyw nYZ -sXl -eFU +aak +aan jyA goK qfd @@ -83710,7 +83715,7 @@ jos bEZ bGv ahA -kvG +aaq iTJ nyZ kEd @@ -86797,7 +86802,7 @@ oJF piv nre bWR -xdr +aar uKb fKC thQ @@ -88104,7 +88109,7 @@ lYb jqu pCY jOJ -pOg +aas cyM ckT clR @@ -90424,7 +90429,7 @@ jdo cmV vxi pbV -tXO +aat vaO vaO jQj @@ -94922,7 +94927,7 @@ xUL aTE qbJ xKE -gcc +aab pNL iuG bPW @@ -95458,8 +95463,8 @@ mSt mWD geO cQv -nGa -fpW +aag +aah oyf dzS uZz @@ -96467,9 +96472,9 @@ cPn wju pIP taP -emd +aac taP -xJD +aad ajD pqj vEd @@ -99569,7 +99574,7 @@ mhq mLO wIA hTO -noB +aaf wIA kti wIA @@ -101859,7 +101864,7 @@ rDv kwl cjP vKa -miu +aaa mlR oKj vKa @@ -103948,7 +103953,7 @@ wkU pvs hjl kFF -ceZ +aap pWa xuB avT @@ -109066,7 +109071,7 @@ ulr jJb xfH puE -rFQ +aae iiY piR tty diff --git a/modular_splurt/code/game/object/items/miscellaneous.dm b/modular_splurt/code/game/object/items/miscellaneous.dm index 9957981363..a1b74b46fe 100644 --- a/modular_splurt/code/game/object/items/miscellaneous.dm +++ b/modular_splurt/code/game/object/items/miscellaneous.dm @@ -74,3 +74,41 @@ /obj/item/disk/data max_mutations = 15 + +//This'll be used for gun permits, such as for heads of staff, crew, and bartenders. Sec and the Captain do not require these + +/obj/item/clothing/accessory/permit + name = "Weapons permit" + desc = "A permit for carrying weapons." + icon = 'modular_splurt/icons/obj/permits.dmi' + icon_state = "permit" + mob_overlay_icon = 'icons/mob/clothing/accessories.dmi' + w_class = WEIGHT_CLASS_TINY + resistance_flags = FIRE_PROOF + var/access = null + var/owner = 0 //To prevent people from just renaming the thing if they steal it + +/obj/item/clothing/accessory/permit/attack_self(mob/user as mob) + if(isliving(user)) + if(!owner) + set_name(user.name) + to_chat(user, "[src] registers your name.") + access += list(ACCESS_WEAPONS) + else + to_chat(user, "[src] already has an owner!") + +/obj/item/clothing/accessory/permit/proc/set_name(new_name) + owner = 1 + if(new_name) + src.name += " ([new_name])" + desc += " It belongs to [new_name]." + +/obj/item/clothing/accessory/permit/head + name = "Heads of staff weapon permit" + desc = "A card indicating that the Head of staff is allowed to carry a weapon." + icon_state = "compermit" + +/obj/item/clothing/accessory/permit/bar + name = "bar weapon permit" + desc = "A card indicating that the barkeep is allowed to carry a weapon, most likely their shotgun." + icon_state = "permit" diff --git a/modular_splurt/code/game/object/items/storage/secure.dm b/modular_splurt/code/game/object/items/storage/secure.dm index b9ecd94fb6..236f616c87 100644 --- a/modular_splurt/code/game/object/items/storage/secure.dm +++ b/modular_splurt/code/game/object/items/storage/secure.dm @@ -66,3 +66,31 @@ new /obj/item/ammo_box/magazine/e45/ion(src) new /obj/item/ammo_box/magazine/e45/taser(src) new /obj/item/ammo_box/magazine/e45/taser(src) + + +/obj/item/storage/secure/briefcase/permits + name = "\improper \'Weapon\' permits case" + desc = "A storage case for weapon permits. Keep this secure!" + + +/obj/item/storage/secure/briefcase/permits/PopulateContents() + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) + new /obj/item/clothing/accessory/permit(src) diff --git a/modular_splurt/code/modules/client/loadout/backpack.dm b/modular_splurt/code/modules/client/loadout/backpack.dm index 1c3958d36c..21a5858d67 100644 --- a/modular_splurt/code/modules/client/loadout/backpack.dm +++ b/modular_splurt/code/modules/client/loadout/backpack.dm @@ -77,3 +77,8 @@ /datum/gear/backpack/nailpolish_purple name = "Purple Nail Polish" path = /obj/item/nailpolish/purple + +/datum/gear/backpack/weaponpermit + name = "Weapon Permit" + path = /obj/item/clothing/accessory/permit + cost = 3 diff --git a/modular_splurt/code/modules/jobs/job_types/command.dm b/modular_splurt/code/modules/jobs/job_types/command.dm new file mode 100644 index 0000000000..a986fcc219 --- /dev/null +++ b/modular_splurt/code/modules/jobs/job_types/command.dm @@ -0,0 +1,19 @@ +/datum/outfit/job/cmo/New() + . = ..() + accessory = /obj/item/clothing/accessory/permit/head + +/datum/outfit/job/quartermaster/New() + . = ..() + accessory = /obj/item/clothing/accessory/permit/head + +/datum/outfit/job/ce/New() + . = ..() + accessory = /obj/item/clothing/accessory/permit/head + +/datum/outfit/job/hop/New() + . = ..() + accessory = /obj/item/clothing/accessory/permit/head + +/datum/outfit/job/rd/New() + . = ..() + accessory = /obj/item/clothing/accessory/permit/head diff --git a/modular_splurt/code/modules/jobs/job_types/service.dm b/modular_splurt/code/modules/jobs/job_types/service.dm new file mode 100644 index 0000000000..956d08a29f --- /dev/null +++ b/modular_splurt/code/modules/jobs/job_types/service.dm @@ -0,0 +1,3 @@ +/datum/outfit/job/bartender/New() + . = ..() + accessory = /obj/item/clothing/accessory/permit/bar diff --git a/modular_splurt/icons/mob/clothing/permits.dmi b/modular_splurt/icons/mob/clothing/permits.dmi new file mode 100644 index 0000000000..19fa30581d Binary files /dev/null and b/modular_splurt/icons/mob/clothing/permits.dmi differ diff --git a/modular_splurt/icons/obj/permits.dmi b/modular_splurt/icons/obj/permits.dmi new file mode 100644 index 0000000000..71dcac3321 Binary files /dev/null and b/modular_splurt/icons/obj/permits.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 414200c430..373fc7497b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4283,8 +4283,10 @@ #include "modular_splurt\code\modules\food_and_drinks\food\snacks.dm" #include "modular_splurt\code\modules\food_and_drinks\recipes\drink_recipes.dm" #include "modular_splurt\code\modules\hydroponics\grown\towercap.dm" +#include "modular_splurt\code\modules\jobs\job_types\command.dm" #include "modular_splurt\code\modules\jobs\job_types\prisoner.dm" #include "modular_splurt\code\modules\jobs\job_types\security_officer.dm" +#include "modular_splurt\code\modules\jobs\job_types\service.dm" #include "modular_splurt\code\modules\keybindings\keybind\movement.dm" #include "modular_splurt\code\modules\mining\equipment\kinetic_crusher.dm" #include "modular_splurt\code\modules\mob\eros_emotes.dm"