From b05e94f4b34fc09f4a0206f0092ab302a825c04c Mon Sep 17 00:00:00 2001 From: Cadyn Date: Mon, 7 Sep 2020 15:23:43 -0700 Subject: [PATCH 1/6] Fixes broken guns Exam now reveals the name of the parts needed instead of the path --- code/modules/projectiles/broken.dm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/broken.dm b/code/modules/projectiles/broken.dm index 9dd3107d6e..a63f685ba1 100644 --- a/code/modules/projectiles/broken.dm +++ b/code/modules/projectiles/broken.dm @@ -32,8 +32,19 @@ if(do_after(user, 5 SECONDS)) to_chat(user, "\The [src] can possibly be restored with:") for(var/resource in material_needs) + var/obj/item/res = resource if(material_needs[resource] > 0) - to_chat(user, "- [bicon(resource)] x [material_needs[resource]] [resource]") + var/res_name = "" + if(ispath(res,/obj/item/stack/material)) + var/obj/item/stack/material/mat_stack = res + var/material/mat = get_material_by_name("[initial(mat_stack.default_type)]") + if(material_needs[resource]>1) + res_name = "[mat.use_name] [mat.sheet_plural_name]" + else + res_name = "[mat.use_name] [mat.sheet_singular_name]" + else + res_name = initial(res.name) + to_chat(user, "- x [material_needs[resource]] [res_name]") /obj/item/weapon/broken_gun/proc/setup_gun(var/obj/item/weapon/gun/path) if(ispath(path)) From 76c426a030d8775f61c8989b7e5a940604c0b32a Mon Sep 17 00:00:00 2001 From: Cadyn Date: Tue, 8 Sep 2020 15:48:22 -0700 Subject: [PATCH 2/6] No changes option added to all cyclers, sprite check added. Added an option for no cosmetic changes to all suit cyclers, and added a check to make sure the sprite exists before fitting it. Also fixed typos in vulpkanin merc voidsuit helmet sprite name. --- code/game/machinery/suit_storage_unit.dm | 54 ++++++++++-------- code/game/machinery/suit_storage_unit_vr.dm | 20 +++---- icons/mob/species/vulpkanin/helmet.dmi | Bin 71563 -> 71561 bytes icons/obj/clothing/species/vulpkanin/hats.dmi | Bin 19169 -> 19168 bytes 4 files changed, 41 insertions(+), 33 deletions(-) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 1e21ee305c..68b745c268 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -623,37 +623,37 @@ name = "Engineering suit cycler" model_text = "Engineering" req_access = list(access_construction) - departments = list("Engineering","Atmospherics","HAZMAT","Construction") + departments = list("Engineering","Atmospherics","HAZMAT","Construction","No Change") /obj/machinery/suit_cycler/mining name = "Mining suit cycler" model_text = "Mining" req_access = list(access_mining) - departments = list("Mining") + departments = list("Mining","No Change") /obj/machinery/suit_cycler/security name = "Security suit cycler" model_text = "Security" req_access = list(access_security) - departments = list("Security","Crowd Control","Security EVA") + departments = list("Security","Crowd Control","Security EVA","No Change") /obj/machinery/suit_cycler/medical name = "Medical suit cycler" model_text = "Medical" req_access = list(access_medical) - departments = list("Medical","Biohazard","Emergency Medical Response") + departments = list("Medical","Biohazard","Emergency Medical Response","No Change") /obj/machinery/suit_cycler/syndicate name = "Nonstandard suit cycler" model_text = "Nonstandard" req_access = list(access_syndicate) - departments = list("Mercenary", "Charring") + departments = list("Mercenary", "Charring","No Change") can_repair = 1 /obj/machinery/suit_cycler/exploration name = "Explorer suit cycler" model_text = "Exploration" - departments = list("Exploration","Old Exploration") + departments = list("Exploration","Old Exploration","No Change") /obj/machinery/suit_cycler/exploration/Initialize() species -= SPECIES_TESHARI @@ -662,33 +662,33 @@ /obj/machinery/suit_cycler/pilot name = "Pilot suit cycler" model_text = "Pilot" - departments = list("Pilot Blue","Pilot") + departments = list("Pilot Blue","Pilot","No Change") /obj/machinery/suit_cycler/vintage name = "Vintage Crew suit cycler" model_text = "Vintage" - departments = list("Vintage Crew") + departments = list("Vintage Crew","No Change") req_access = null /obj/machinery/suit_cycler/vintage/pilot name = "Vintage Pilot suit cycler" model_text = "Vintage Pilot" - departments = list("Vintage Pilot (Bubble Helm)","Vintage Pilot (Closed Helm)") + departments = list("Vintage Pilot (Bubble Helm)","Vintage Pilot (Closed Helm)","No Change") /obj/machinery/suit_cycler/vintage/medsci name = "Vintage MedSci suit cycler" model_text = "Vintage MedSci" - departments = list("Vintage Medical (Bubble Helm)","Vintage Medical (Closed Helm)","Vintage Research (Bubble Helm)","Vintage Research (Closed Helm)") + departments = list("Vintage Medical (Bubble Helm)","Vintage Medical (Closed Helm)","Vintage Research (Bubble Helm)","Vintage Research (Closed Helm)","No Change") /obj/machinery/suit_cycler/vintage/rugged name = "Vintage Ruggedized suit cycler" model_text = "Vintage Ruggedized" - departments = list("Vintage Engineering","Vintage Marine","Vintage Officer","Vintage Mercenary") + departments = list("Vintage Engineering","Vintage Marine","Vintage Officer","Vintage Mercenary","No Change") /obj/machinery/suit_cycler/vintage/omni name = "Vintage Master suit cycler" model_text = "Vintage Master" - departments = list("Vintage Crew","Vintage Engineering","Vintage Pilot (Bubble Helm)","Vintage Pilot (Closed Helm)","Vintage Medical (Bubble Helm)","Vintage Medical (Closed Helm)","Vintage Research (Bubble Helm)","Vintage Research (Closed Helm)","Vintage Marine","Vintage Officer","Vintage Mercenary") + departments = list("Vintage Crew","Vintage Engineering","Vintage Pilot (Bubble Helm)","Vintage Pilot (Closed Helm)","Vintage Medical (Bubble Helm)","Vintage Medical (Closed Helm)","Vintage Research (Bubble Helm)","Vintage Research (Closed Helm)","Vintage Marine","Vintage Officer","Vintage Mercenary","No Change") /obj/machinery/suit_cycler/vintage/Initialize() species -= SPECIES_TESHARI @@ -1054,17 +1054,9 @@ /obj/machinery/suit_cycler/proc/apply_paintjob() var/obj/item/clothing/head/helmet/parent_helmet var/obj/item/clothing/suit/space/parent_suit - + var/turf/T = get_turf(src) if(!target_species || !target_department) return - - if(target_species) - if(helmet) helmet.refit_for_species(target_species) - if(suit) - suit.refit_for_species(target_species) - if(suit.helmet) - suit.helmet.refit_for_species(target_species) - //Now "Complete" with most departmental and variant suits, and sorted by department. These aren't available in the standard or emagged cycler lists because they're incomplete for most species. switch(target_department) if("No Change") @@ -1222,7 +1214,23 @@ parent_suit = /obj/item/clothing/suit/space/void/refurb/mercenary/talon //VOREStation Addition End //END: downstream variant space - + if(target_species) + //Making sure all of our items have the sprites to be refitted. + var/helmet_check = ((helmet!=null && (initial(parent_helmet.icon_state) in icon_states(helmet.sprite_sheets_obj[target_species],1))) || helmet==null) + //If the helmet exists, only return true if there's also sprites for it. If the helmet doesn't exist, return true. + var/suit_check = ((suit!=null && (initial(parent_suit.icon_state) in icon_states(suit.sprite_sheets_obj[target_species],1))) || suit==null) + var/suit_helmet_check = ((suit.helmet!=null && (initial(parent_helmet.icon_state) in icon_states(suit.helmet.sprite_sheets_obj[target_species],1))) || suit.helmet==null) + if(helmet_check && suit_check && suit_helmet_check) + if(helmet) + helmet.refit_for_species(target_species) + if(suit) + suit.refit_for_species(target_species) + if(suit.helmet) + suit.helmet.refit_for_species(target_species) + else + //If they don't, alert the user and stop here. + T.visible_message("[bicon(src)]Unable to apply specified cosmetics with specified species. Please try again with a different species or cosmetic option selected.") + return //look at this! isn't it beautiful? -KK (well ok not beautiful but it's a lot cleaner) if(helmet && target_department != "No Change") var/obj/item/clothing/H = new parent_helmet @@ -1240,7 +1248,7 @@ suit.desc = initial(parent_suit.desc) suit.icon_state = initial(parent_suit.icon_state) suit.item_state = initial(parent_suit.item_state) - suit.item_state_slots = S.item_state_slots + suit.item_state_slots = S.item_state_slots qdel(S) //can't believe I forgot to fix this- now helmets will properly cycle if they're attached to a suit -KK diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm index cec50f5fcc..82a6998115 100644 --- a/code/game/machinery/suit_storage_unit_vr.dm +++ b/code/game/machinery/suit_storage_unit_vr.dm @@ -1,11 +1,11 @@ /obj/machinery/suit_cycler - departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Emergency Medical Response","Crowd Control","Exploration","Pilot Blue","Pilot","Director","Prototype") + departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Emergency Medical Response","Crowd Control","Exploration","Pilot Blue","Pilot","Director","Prototype","No Change") species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_VULPKANIN, SPECIES_GREY_YW /*ywedit*/) // Old Exploration is too WIP to use right now /obj/machinery/suit_cycler/exploration req_access = list(access_explorer) - departments = list("Exploration") + departments = list("Exploration","No Change") /obj/machinery/suit_cycler/pilot req_access = list(access_pilot) @@ -14,7 +14,7 @@ name = "Director suit cycler" model_text = "Director" req_access = list(access_captain) - departments = list("Director") + departments = list("Director","No Change") /obj/machinery/suit_cycler/captain/Initialize() //No Teshari Sprites species -= SPECIES_TESHARI @@ -24,7 +24,7 @@ name = "Prototype suit cycler" model_text = "Prototype" req_access = list(access_hos) - departments = list("Prototype") + departments = list("Prototype","No Change") /obj/machinery/suit_cycler/prototype/Initialize() //No Teshari Sprites species -= SPECIES_TESHARI @@ -34,34 +34,34 @@ name = "Talon crew suit cycler" model_text = "Talon crew" req_access = list(access_talon) - departments = list("Talon Crew") + departments = list("Talon Crew","No Change") /obj/machinery/suit_cycler/vintage/tpilot name = "Talon pilot suit cycler" model_text = "Talon pilot" req_access = list(access_talon) - departments = list("Talon Pilot (Bubble Helm)","Talon Pilot (Closed Helm)") + departments = list("Talon Pilot (Bubble Helm)","Talon Pilot (Closed Helm)","No Change") /obj/machinery/suit_cycler/vintage/tengi name = "Talon engineer suit cycler" model_text = "Talon engineer" req_access = list(access_talon) - departments = list("Talon Engineering") + departments = list("Talon Engineering","No Change") /obj/machinery/suit_cycler/vintage/tguard name = "Talon guard suit cycler" model_text = "Talon guard" req_access = list(access_talon) - departments = list("Talon Marine","Talon Mercenary") + departments = list("Talon Marine","Talon Mercenary","No Change") /obj/machinery/suit_cycler/vintage/tmedic name = "Talon doctor suit cycler" model_text = "Talon doctor" req_access = list(access_talon) - departments = list("Talon Medical (Bubble Helm)","Talon Medical (Closed Helm)") + departments = list("Talon Medical (Bubble Helm)","Talon Medical (Closed Helm)","No Change") /obj/machinery/suit_cycler/vintage/tcaptain name = "Talon captain suit cycler" model_text = "Talon captain" req_access = list(access_talon) - departments = list("Talon Officer") \ No newline at end of file + departments = list("Talon Officer","No Change") \ No newline at end of file diff --git a/icons/mob/species/vulpkanin/helmet.dmi b/icons/mob/species/vulpkanin/helmet.dmi index ee1721cc37c8979cfbdd7b6cf986259b4771fe3b..11cbf6bfd9e2e94381fa1f4f6c9d457da749d73d 100644 GIT binary patch delta 597 zcmV-b0;>IsuLOy&1dt>FSdk?rf1(<(XkQ^R&Lz36eetKf^_yC~u8Tdz#KEhjdj3%svjf+;RZI2rshG9IO`DG&DeFvXsU9fi$^_@M zuPIiMn<|mER6i86nqyK+^<2!hQ9DX%sTP-DBD0H}Kc$?bnvJ$njC{kMf8=Fe_!AqG zIuctM1zP=A$6Dh0OpHn+H|1Ps7ZM^};L>t_GRYn)V<82~dB5x;v9=l1vxh6kwdFjK z!3G6| zh)8@KA6?fA5@e1$H!Ab&f8VuCiKmbGfTQgsg$F0=X#D(6X-%Tkmn8m_es_*Stf^e; z(P@skHH`plM2>fCG)x}+g9ln!PLru32fSav>aQMK zZ8*pPa^MUX2VH}fhmZ*#gSH%Lvm4)sj%~H}no#Vb_E$PHez5Oj*JDF&}uDI~Y}4F>KLma~rFrE4G- z^}Id%tQ#_s4kCbjKEoow>Bt_sX`B(N8GPvVMA&ZG08L@YbZpTkJ|y7Rat|fLFT9G9te`+;i(Y``toJ(?B|3tQd={)@`2oNYJ=Vq3X&S&3a zJLlSu>euV<)w_CmTNOKsiGx>5_57nOW_zx4tCs5LQ!#6an>HUlQr4N&Qaw=2l?l#i zUsJ3iH&r5SseUMCHOHiu>baP0qIQ(jQY|jQL}nW~e@Qt}%GLz44$sN&1l3>E=N_hf7K&9=LzoY@e%n~Z>1N7AP4Q^mBT?@o6U z5s44uqpNyBg3MvxMrEG;e}|SS@$505aIhVv@Ze+}ji25rjY*XGlDwbN?ao1nwUkRe zI?W-qrV)VcXhcKzdN6P$$-i$o6E-d;r5*P3^g8$m8YU0^!2_)6-?L~ zby+D0gxnr^mWJH}Oh0n*h0NOA3AeWPWk~t1S~Vul*c8;-df>>h1ycZPZB4P|NF=bi5?Gwz#5Z~< zqzLBzEjCPG?qRL1PaPM~7L%T+Z#cGx@tShgr!;=bD2Sbq4;_gUZe8feUp?+qL?xd5 zT_)et?Gi6YkO>5TU22k{rjg@s5BdI6qSl=cf51e3NMUp82f95u=2-|`;zEnwV)14J zNBpOUk2zu`nsumc4ong3stYY@KMmop5kRpdsH|uG?Ho#RAq|6%jjkg}ipvxZ!sSiN zeWmrJxN|#cxkY^Hz_bymLjlIcyO%~ci_U~<;c`1ps-+8m1#F!uIN^jZO0fFl_B4R@ zO2F287TO)ag-Ic{ZsZ;ebCNznp9)8>W1ocN_UF@&$HYKKr94V1V6~4Ni*IS5hQT%Z zOnBi4ZfP?Tgib1eV#_KZ?e`pjTwXGGT^9uW_h5!{V2Xvajv7d=mgU|&y==_pd0YJj Rxx+nuK<$75IyA-4^!g_mC8t6;(fTOQrAk+4Cop>8<+n__TRZ>*q~j zF4c{vmYp3i-vY625;@Ej6zV3CvqOeWL9K2)2M!&W0$8gX3LOU`fz1nn#R*1iTMoGx zz}$a?mci7cQr#ST&V;#Q(jyHmhi*S!QdUEZ+NqRV#8(_xX+*`L0OR7Xm9}gaort1!%WOFotz0O7pqoU_2uFNPg4JKQClA^e z0=n6;&~^{5O9f(WMjpU0C+P$9sW9|D4pB(1e?IMahzxX8OryjMR{Ovq+m1Z73@*_p z!U_jy_4-7d(6I=h(1Cm448+}z9gxd&2CwUafd3rKP;yKmb1I`e$;GnVs>heLT0d{< Se=HU}vton-r7E)_0>4NL`2Fnw From 92a14619b16141829019d6916339bdbeef0828de Mon Sep 17 00:00:00 2001 From: Cadyn Date: Thu, 10 Sep 2020 15:41:21 -0700 Subject: [PATCH 3/6] General map tweaks. CD gets cycler and windoor for suit. Pilot perms added to explo doors and gun lockers. --- maps/southern_cross/southern_cross-1.dmm | 14 +++++++------- maps/southern_cross/southern_cross-2.dmm | 2 +- maps/southern_cross/southern_cross-3.dmm | 4 ++-- maps/southern_cross/southern_cross-5.dmm | 4 ++-- maps/southern_cross/southern_cross-7.dmm | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/maps/southern_cross/southern_cross-1.dmm b/maps/southern_cross/southern_cross-1.dmm index 033ce706f6..bfa85b657a 100644 --- a/maps/southern_cross/southern_cross-1.dmm +++ b/maps/southern_cross/southern_cross-1.dmm @@ -1022,7 +1022,7 @@ "aCd" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/port) "aCg" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/reinforced,/area/rnd/xenobiology) "aCh" = (/obj/structure/disposalpipe/trunk,/obj/structure/disposaloutlet{dir = 8},/turf/simulated/floor/reinforced,/area/rnd/xenobiology) -"aCi" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/airlock{name = "Exploration Locker Room"; req_access = list(43)},/turf/simulated/floor/tiled,/area/hangar/lockerroomone) +"aCi" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/airlock{name = "Exploration Locker Room"; req_access = null; req_one_access = list(43,67)},/turf/simulated/floor/tiled,/area/hangar/lockerroomone) "aCj" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/hangar/lockerroomone) "aCk" = (/obj/structure/bed/chair{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/monotile,/area/hangar/lockerroomone) "aCl" = (/obj/machinery/camera/network/first_deck{c_tag = "Hangar One - Exploration Locker Room"; dir = 8},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/hangar/lockerroomone) @@ -1126,7 +1126,7 @@ "aFg" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/firstdeck/forestarboard) "aFh" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille/broken,/obj/item/weapon/material/shard{icon_state = "medium"},/obj/item/weapon/material/shard,/obj/item/stack/rods,/turf/simulated/floor/plating,/area/maintenance/firstdeck/forestarboard) "aFj" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled/steel,/area/hangar/lockerroomthree) -"aFk" = (/obj/machinery/door/firedoor/border_only,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock{name = "Exploration Locker Room"; req_access = list(43)},/turf/simulated/floor/tiled,/area/hangar/lockerroomthree) +"aFk" = (/obj/machinery/door/firedoor/border_only,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock{name = "Exploration Locker Room"; req_access = null; req_one_access = list(43,67)},/turf/simulated/floor/tiled,/area/hangar/lockerroomthree) "aFn" = (/obj/item/stack/tile/wood,/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor,/area/construction/firstdeck/construction4) "aFq" = (/obj/structure/closet/emcloset,/obj/machinery/ai_status_display{pixel_y = 32},/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/red/border{dir = 9},/turf/simulated/floor/tiled,/area/hallway/secondary/firstdeck/research_access) "aFr" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/white/border{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/firstdeck/research_access) @@ -1165,7 +1165,7 @@ "aGe" = (/obj/structure/table/standard,/obj/item/weapon/folder/yellow,/obj/item/weapon/folder/yellow,/obj/item/device/multitool,/obj/item/weapon/paper_bin,/obj/item/weapon/pen/blue{pixel_x = -3; pixel_y = 2},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled,/area/tcomm/computer) "aGf" = (/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/turf/simulated/floor/tiled,/area/hallway/secondary/firstdeck/research_access) "aGg" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{req_access = null; req_one_access = null},/turf/simulated/floor/plating,/area/maintenance/firstdeck/centralstarboard) -"aGh" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Exploration Locker Room Access"; req_access = list(43); req_one_access = null},/turf/simulated/floor/plating,/area/hangar/lockerroomthree) +"aGh" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Exploration Locker Room Access"; req_access = null; req_one_access = list(43,67)},/turf/simulated/floor/plating,/area/hangar/lockerroomthree) "aGi" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled,/area/hangar/lockerroomthree) "aGj" = (/obj/structure/bed/chair{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/monotile,/area/hangar/lockerroomthree) "aGk" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/hangar/lockerroomthree) @@ -1327,7 +1327,7 @@ "aLl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/steeldecal/steel_decals5,/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/ascenter) "aLm" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/ascenter) "aLn" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/hangar/lockerroomtwo) -"aLo" = (/obj/machinery/door/firedoor/border_only,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock{name = "Exploration Locker Room"; req_access = list(43)},/turf/simulated/floor/tiled,/area/hangar/lockerroomtwo) +"aLo" = (/obj/machinery/door/firedoor/border_only,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock{name = "Exploration Locker Room"; req_access = null; req_one_access = list(43,67)},/turf/simulated/floor/tiled,/area/hangar/lockerroomtwo) "aLr" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/starboard) "aLs" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/firealarm{pixel_y = 24},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/firstdeck/ep_starboard) "aLt" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals4,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/firstdeck/ep_starboard) @@ -1391,7 +1391,7 @@ "aNh" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/light,/turf/simulated/floor/tiled,/area/hangar/lockerroomone) "aNj" = (/turf/simulated/wall/r_wall,/area/tcomm/tcomstorage) "aNk" = (/turf/simulated/floor/reinforced,/area/rnd/xenobiology) -"aNl" = (/obj/structure/closet/secure_closet/guncabinet{req_one_access = list(43)},/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/turf/simulated/floor/tiled,/area/hangar/lockerroomone) +"aNl" = (/obj/structure/closet/secure_closet/guncabinet{req_one_access = list(43,67)},/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/turf/simulated/floor/tiled,/area/hangar/lockerroomone) "aNn" = (/obj/structure/disposalpipe/segment,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/reinforced,/area/rnd/xenobiology) "aNo" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftport) "aNq" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) @@ -2042,7 +2042,7 @@ "dYM" = (/obj/structure/closet/crate/internals,/obj/random/tank,/obj/random/tank,/obj/random/tank,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftstarboard) "dYO" = (/obj/structure/closet,/obj/item/clothing/glasses/welding,/obj/item/weapon/weldingtool,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/research,/obj/random/maintenance/research,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftstarboard) "dYQ" = (/obj/structure/closet,/obj/item/weapon/lipstick/purple,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftstarboard) -"dYS" = (/obj/machinery/camera/network/first_deck{c_tag = "Hangar Two - Exploration Locker Room Two"; dir = 4},/obj/structure/closet/secure_closet/guncabinet{req_one_access = list(43)},/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier/carbine,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/turf/simulated/floor/tiled,/area/hangar/lockerroomtwo) +"dYS" = (/obj/machinery/camera/network/first_deck{c_tag = "Hangar Two - Exploration Locker Room Two"; dir = 4},/obj/structure/closet/secure_closet/guncabinet{req_one_access = list(67,43)},/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier/carbine,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/turf/simulated/floor/tiled,/area/hangar/lockerroomtwo) "dYT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor/corner{dir = 1},/obj/effect/floor_decal/corner/green/bordercorner{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/starboard) "dYU" = (/obj/structure/mirror{pixel_y = 25},/turf/simulated/floor,/area/construction/firstdeck/construction3) "dYV" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/mime,/obj/item/weapon/pen/crayon/mime,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor,/area/construction/firstdeck/construction3) @@ -2100,7 +2100,7 @@ "dZV" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 8},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftstarboard) "dZW" = (/obj/random/trash,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftstarboard) "dZY" = (/obj/random/junk,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftstarboard) -"dZZ" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Exploration Locker Room Access"; req_access = list(43); req_one_access = null},/turf/simulated/floor/plating,/area/hangar/lockerroomtwo) +"dZZ" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Exploration Locker Room Access"; req_access = null; req_one_access = list(43,67)},/turf/simulated/floor/plating,/area/hangar/lockerroomtwo) "eaa" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/hangar/lockerroomtwo) "eab" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/monotile,/area/hangar/lockerroomtwo) "eac" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/construction/firstdeck/construction3) diff --git a/maps/southern_cross/southern_cross-2.dmm b/maps/southern_cross/southern_cross-2.dmm index 862659d212..83d61f2158 100644 --- a/maps/southern_cross/southern_cross-2.dmm +++ b/maps/southern_cross/southern_cross-2.dmm @@ -1753,7 +1753,7 @@ "aOK" = (/obj/machinery/suit_cycler/security,/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/camera/network/command{c_tag = "EVA - Port"},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "aOL" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "aOM" = (/obj/structure/table/rack,/obj/item/device/suit_cooling_unit,/obj/item/device/suit_cooling_unit,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) -"aON" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) +"aON" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/gps,/obj/item/device/gps,/obj/item/device/gps,/obj/item/device/gps,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "aOO" = (/obj/structure/reagent_dispensers/fueltank,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "aOP" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/light{dir = 1},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "aOQ" = (/obj/structure/table/reinforced,/obj/machinery/requests_console{department = "EVA"; pixel_y = 26},/obj/fiftyspawner/glass,/obj/fiftyspawner/glass,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) diff --git a/maps/southern_cross/southern_cross-3.dmm b/maps/southern_cross/southern_cross-3.dmm index 42ce2536a4..5c4c3c4fb9 100644 --- a/maps/southern_cross/southern_cross-3.dmm +++ b/maps/southern_cross/southern_cross-3.dmm @@ -1679,7 +1679,7 @@ "sBY" = (/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/maintenance/solars/foreportsolar) "sEf" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/structure/catwalk,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/thirddeck/dormsaft) "sEn" = (/obj/machinery/power/tracker,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/airless,/area/solar/forestarboardsolar) -"sFo" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/light,/turf/simulated/floor/carpet,/area/crew_quarters/heads/sc/sd) +"sFo" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/light,/obj/machinery/suit_cycler/captain,/turf/simulated/floor/carpet,/area/crew_quarters/heads/sc/sd) "sFQ" = (/obj/machinery/door/firedoor/border_only,/obj/effect/wingrille_spawn/reinforced,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "heads_meeting"; name = "Meeting Room Window Shutters"; opacity = 0},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green,/turf/simulated/floor/plating,/area/bridge/meeting_room) "sGT" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/corner/beige/border,/turf/simulated/floor/tiled,/area/hallway/primary/thirddeck/aftdoorm) "sGX" = (/obj/machinery/computer/communications,/turf/simulated/floor/wood,/area/crew_quarters/heads/sc/sd) @@ -1923,7 +1923,7 @@ "vik" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/thirddeck/central) "viX" = (/obj/effect/floor_decal/borderfloorblack{dir = 5},/obj/effect/floor_decal/industrial/danger{dir = 5},/turf/simulated/floor/tiled/techfloor/grid,/area/hallway/primary/thirddeck/central) "vjg" = (/obj/machinery/door/airlock{name = "Unisex Restrooms"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/vistor_room_10) -"vkF" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/clothing/mask/gas,/obj/structure/window/basic{dir = 1},/obj/structure/window/reinforced{dir = 8; health = null},/obj/structure/window/reinforced{dir = 4},/obj/item/clothing/suit/space/void/captain,/obj/item/clothing/head/helmet/space/void/captain,/turf/simulated/floor/wood,/area/crew_quarters/heads/sc/sd) +"vkF" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/clothing/mask/gas,/obj/structure/window/reinforced{dir = 8; health = null},/obj/structure/window/reinforced{dir = 4},/obj/item/clothing/suit/space/void/captain,/obj/item/clothing/head/helmet/space/void/captain,/obj/machinery/door/window/holowindoor{dir = 1; req_access = list(20)},/turf/simulated/floor/wood,/area/crew_quarters/heads/sc/sd) "vkN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/hallway/primary/thirddeck/port) "vlA" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/cafeteria) "vmg" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/meter,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; layer = 3.3; master_tag = "aft_starboard_solar_airlock"; name = "interior access button"; pixel_x = 25; pixel_y = 25; req_access = list(); req_one_access = list(11,24)},/turf/simulated/floor/plating,/area/maintenance/solars/aftstarboardsolar) diff --git a/maps/southern_cross/southern_cross-5.dmm b/maps/southern_cross/southern_cross-5.dmm index 51d631719e..11fe2eecea 100644 --- a/maps/southern_cross/southern_cross-5.dmm +++ b/maps/southern_cross/southern_cross-5.dmm @@ -36,7 +36,7 @@ "aZ" = (/obj/item/weapon/bikehorn/rubberducky,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled/freezer,/area/surface/outpost/main/showers) "ba" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/full,/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/surface/outpost/civilian/pool) "bb" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/purple/border{dir = 1},/turf/simulated/floor/tiled,/area/surface/outpost/main/exploration) -"bc" = (/obj/structure/closet/secure_closet/guncabinet{req_access = list(43); req_one_access = newlist()},/obj/effect/floor_decal/corner/purple{dir = 5},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/dark,/area/surface/outpost/main/exploration) +"bc" = (/obj/structure/closet/secure_closet/guncabinet{req_access = list(43,67); req_one_access = newlist()},/obj/effect/floor_decal/corner/purple{dir = 5},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/dark,/area/surface/outpost/main/exploration) "bd" = (/obj/effect/floor_decal/corner/white{dir = 9},/obj/effect/floor_decal/corner/white{dir = 6},/obj/structure/bed/chair,/turf/simulated/floor/tiled,/area/surface/outpost/main/corridor/right_upper) "be" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/full,/obj/structure/grille,/turf/simulated/floor/plating,/area/surface/outpost/mining_main/storage) "bg" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/surface/outpost/main/corridor/right_lower) @@ -758,7 +758,7 @@ "sK" = (/obj/machinery/vending/loadout,/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/white/border{dir = 4},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/surface/outpost/main/laundry) "sL" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/blue{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/monotile,/area/surface/outpost/main/landing) "sN" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/junction{dir = 2; icon_state = "pipe-j2"},/turf/simulated/floor/tiled,/area/surface/outpost/main/corridor/dorms) -"sO" = (/obj/structure/closet/secure_closet/guncabinet/phase{name = "phase weapon cabinet"; req_access = list(43); req_one_access = newlist()},/obj/item/clothing/accessory/holster/hip,/obj/effect/floor_decal/corner/purple{dir = 5},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/camera/network/main_outpost{c_tag = "MO - Exploration Prep"; dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/turf/simulated/floor/tiled/dark,/area/surface/outpost/main/exploration) +"sO" = (/obj/structure/closet/secure_closet/guncabinet/phase{name = "phase weapon cabinet"; req_access = list(43,67); req_one_access = newlist()},/obj/item/clothing/accessory/holster/hip,/obj/effect/floor_decal/corner/purple{dir = 5},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/camera/network/main_outpost{c_tag = "MO - Exploration Prep"; dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/turf/simulated/floor/tiled/dark,/area/surface/outpost/main/exploration) "sP" = (/obj/machinery/hologram/holopad,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled,/area/surface/outpost/main/airlock/landing_south) "sQ" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/full,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/surface/outpost/security/maa) "sR" = (/turf/simulated/floor/water/shoreline{dir = 5},/area/surface/outside/ocean) diff --git a/maps/southern_cross/southern_cross-7.dmm b/maps/southern_cross/southern_cross-7.dmm index f1fe620891..ff47e2789b 100644 --- a/maps/southern_cross/southern_cross-7.dmm +++ b/maps/southern_cross/southern_cross-7.dmm @@ -612,7 +612,7 @@ "lY" = (/obj/structure/bed/chair/shuttle{dir = 1},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/shuttle/floor/black,/area/shuttle/shuttle3/start) "lZ" = (/obj/structure/bed/chair/shuttle{dir = 1},/turf/simulated/shuttle/floor/black,/area/shuttle/shuttle3/start) "ma" = (/obj/machinery/vending/wallmed1{dir = 8},/turf/simulated/shuttle/wall/voidcraft/blue,/area/shuttle/shuttle3/start) -"mb" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/structure/closet/secure_closet/guncabinet{req_one_access = list(43)},/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/effect/floor_decal/corner/green/border{dir = 4},/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/turf/simulated/floor/tiled,/area/expoutpost/hangarone) +"mb" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/structure/closet/secure_closet/guncabinet{req_one_access = list(43,67)},/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/effect/floor_decal/corner/green/border{dir = 4},/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/turf/simulated/floor/tiled,/area/expoutpost/hangarone) "mc" = (/obj/structure/window/reinforced/full,/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/expoutpost/hangarone) "md" = (/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/floor/tiled/white,/area/expoutpost/hangaroneprep) "me" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 5},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled/white,/area/expoutpost/hangaroneprep) @@ -625,7 +625,7 @@ "ml" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/monofloor,/area/expoutpost/hangarone) "mm" = (/obj/machinery/door/airlock/centcom{req_one_access = newlist()},/turf/simulated/shuttle/floor/black,/area/shuttle/shuttle3/start) "mn" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/monofloor,/area/expoutpost/hangarone) -"mo" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/structure/closet/secure_closet/guncabinet{req_one_access = list(43)},/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/effect/floor_decal/corner/green/border{dir = 4},/obj/item/clothing/accessory/holster/waist,/turf/simulated/floor/tiled,/area/expoutpost/hangarone) +"mo" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/structure/closet/secure_closet/guncabinet{req_one_access = list(43,67)},/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/effect/floor_decal/corner/green/border{dir = 4},/obj/item/clothing/accessory/holster/waist,/turf/simulated/floor/tiled,/area/expoutpost/hangarone) "mp" = (/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/obj/structure/table/glass,/obj/item/weapon/storage/firstaid/o2,/obj/item/weapon/storage/firstaid/adv{pixel_x = 3; pixel_y = 3},/turf/simulated/floor/tiled/white,/area/expoutpost/hangaroneprep) "mq" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/white,/area/expoutpost/hangaroneprep) "mr" = (/obj/machinery/hologram/holopad,/obj/effect/floor_decal/industrial/outline/grey,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/white,/area/expoutpost/hangaroneprep) From eb19c5259897b12ef41889d622e3ce496e042e58 Mon Sep 17 00:00:00 2001 From: Shadow Quill Date: Fri, 11 Sep 2020 14:03:47 -0500 Subject: [PATCH 4/6] Welderbomb! --- code/game/objects/items/weapons/tools/weldingtool.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm index ee00789bfc..0052d24156 100644 --- a/code/game/objects/items/weapons/tools/weldingtool.dm +++ b/code/game/objects/items/weapons/tools/weldingtool.dm @@ -159,9 +159,9 @@ else message_admins("[key_name_admin(user)] triggered a fueltank explosion with a welding tool.") log_game("[key_name(user)] triggered a fueltank explosion with a welding tool.") - //Yawn edit: removed weldertank booms to_chat(user, "You begin welding on the fueltank and with a moment of lucidity you realize... you are doomed.") //CHOMP Edit: changed yawn edit to just say you are doomed - //End yawn edit + var/obj/structure/reagent_dispensers/fueltank/tank = O // CHOMPS edit - Readds welderbombing + tank.explode() return if (src.welding) remove_fuel(1) From 33d9792678a381f0a134a50251761db11ff3d518 Mon Sep 17 00:00:00 2001 From: Shadow Quill Date: Sat, 12 Sep 2020 19:30:22 -0500 Subject: [PATCH 5/6] Anti Pref Breaking --- .../carbon/human/species/shadekin/shadekin_abilities.dm | 2 +- .../carbon/human/species/station/protean_vr/protean_blob.dm | 2 +- .../living/simple_mob/subtypes/vore/demon/demon_abilities.dm | 4 ++-- .../living/simple_mob/subtypes/vore/shadekin/ability_procs.dm | 2 +- .../simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm index 632d45ea4d..9dfce1ee7a 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm @@ -95,7 +95,7 @@ var/list/potentials = living_mobs(0) if(potentials.len) var/mob/living/target = pick(potentials) - if(istype(target) && vore_selected) + if(target.devourable && target.can_be_drop_prey && istype(target) && vore_selected) target.forceMove(vore_selected) to_chat(target,"\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm index 282f8b6c3d..b9e12efe4b 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm @@ -257,7 +257,7 @@ var/list/potentials = living_mobs(0) if(potentials.len) var/mob/living/target = pick(potentials) - if(istype(target) && vore_selected) + if(target.devourable && target.can_be_drop_prey && istype(target) && vore_selected) if(target.buckled) target.buckled.unbuckle_mob(target, force = TRUE) target.forceMove(vore_selected) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm index c95dbded2c..2b04fe0c66 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm @@ -56,7 +56,7 @@ var/list/potentials = living_mobs(0) if(potentials.len) var/mob/living/target = pick(potentials) - if(istype(target) && vore_selected) + if(target.devourable && target.can_be_drop_prey && istype(target) && vore_selected) target.forceMove(vore_selected) to_chat(target,"\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") @@ -203,7 +203,7 @@ var/list/potentials = living_mobs(0) if(potentials.len) var/mob/living/target = pick(potentials) - if(istype(target) && vore_selected) + if(target.devourable && target.can_be_drop_prey && istype(target) && vore_selected) target.forceMove(vore_selected) to_chat(target,"\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm index 491d0011d2..9edb1c8a2c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm @@ -44,7 +44,7 @@ var/list/potentials = living_mobs(0) if(potentials.len) var/mob/living/target = pick(potentials) - if(istype(target) && vore_selected) + if(target.devourable && target.can_be_drop_prey && istype(target) && vore_selected) target.forceMove(vore_selected) to_chat(target,"\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm index 668258c81d..8bdc9fac92 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm @@ -314,7 +314,7 @@ var/list/potentials = living_mobs(0) if(potentials.len) var/mob/living/target = pick(potentials) - if(istype(target) && vore_selected) + if(target.devourable && target.can_be_drop_prey && istype(target) && vore_selected) target.forceMove(vore_selected) to_chat(target,"\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") From 5702e574b2b5df0df2650820d312f2493278a970 Mon Sep 17 00:00:00 2001 From: Shadow Quill Date: Sat, 12 Sep 2020 19:33:59 -0500 Subject: [PATCH 6/6] Update --- .../carbon/human/species/shadekin/shadekin_abilities.dm | 2 +- .../carbon/human/species/station/protean_vr/protean_blob.dm | 2 +- .../living/simple_mob/subtypes/vore/demon/demon_abilities.dm | 4 ++-- .../living/simple_mob/subtypes/vore/shadekin/ability_procs.dm | 2 +- .../simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm index 9dfce1ee7a..c1c9ad064b 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm @@ -95,7 +95,7 @@ var/list/potentials = living_mobs(0) if(potentials.len) var/mob/living/target = pick(potentials) - if(target.devourable && target.can_be_drop_prey && istype(target) && vore_selected) + if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected) target.forceMove(vore_selected) to_chat(target,"\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm index b9e12efe4b..98f0a3190d 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm @@ -257,7 +257,7 @@ var/list/potentials = living_mobs(0) if(potentials.len) var/mob/living/target = pick(potentials) - if(target.devourable && target.can_be_drop_prey && istype(target) && vore_selected) + if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected) if(target.buckled) target.buckled.unbuckle_mob(target, force = TRUE) target.forceMove(vore_selected) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm index 2b04fe0c66..87200c0caf 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm @@ -56,7 +56,7 @@ var/list/potentials = living_mobs(0) if(potentials.len) var/mob/living/target = pick(potentials) - if(target.devourable && target.can_be_drop_prey && istype(target) && vore_selected) + if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected) target.forceMove(vore_selected) to_chat(target,"\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") @@ -203,7 +203,7 @@ var/list/potentials = living_mobs(0) if(potentials.len) var/mob/living/target = pick(potentials) - if(target.devourable && target.can_be_drop_prey && istype(target) && vore_selected) + if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected) target.forceMove(vore_selected) to_chat(target,"\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm index 9edb1c8a2c..f1fc9914c2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm @@ -44,7 +44,7 @@ var/list/potentials = living_mobs(0) if(potentials.len) var/mob/living/target = pick(potentials) - if(target.devourable && target.can_be_drop_prey && istype(target) && vore_selected) + if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected) target.forceMove(vore_selected) to_chat(target,"\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm index 8bdc9fac92..9fc362e4b9 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm @@ -314,7 +314,7 @@ var/list/potentials = living_mobs(0) if(potentials.len) var/mob/living/target = pick(potentials) - if(target.devourable && target.can_be_drop_prey && istype(target) && vore_selected) + if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected) target.forceMove(vore_selected) to_chat(target,"\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!")