From dcb82acbca3b0325f40f5c9672cc65daa01e64b3 Mon Sep 17 00:00:00 2001 From: Captain277 Date: Mon, 1 Feb 2021 00:10:44 -0800 Subject: [PATCH] Updates, tweaks, and changes. Of course. --- _maps/map_files/triumph/triumph-04-deck4.dmm | 165 +++--- code/datums/outfits/misc.dm | 2 + .../objects/items/weapons/storage/belt.dm | 42 ++ .../loadout/loadout_event_rewards.dm | 2 +- code/modules/instruments/instruments/item.dm | 1 + icons/mob/belt.dmi | Bin 21434 -> 21573 bytes icons/obj/clothing/belts.dmi | Bin 9245 -> 9631 bytes .../submaps/space/trade_port/tradeport.dmm | 481 +++++++++++------- 8 files changed, 416 insertions(+), 277 deletions(-) diff --git a/_maps/map_files/triumph/triumph-04-deck4.dmm b/_maps/map_files/triumph/triumph-04-deck4.dmm index 251adbf8b06..c2fe7c1af94 100644 --- a/_maps/map_files/triumph/triumph-04-deck4.dmm +++ b/_maps/map_files/triumph/triumph-04-deck4.dmm @@ -780,10 +780,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "aFu" = ( /obj/effect/shuttle_landmark/automatic/station_dockpoint1, @@ -1452,6 +1451,9 @@ "bbp" = ( /obj/effect/floor_decal/industrial/warning/full, /obj/structure/anomaly_container, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/shuttle/excursion/cargo) "bbx" = ( @@ -3839,7 +3841,7 @@ "cEr" = ( /obj/machinery/portable_atmospherics/powered/scrubber, /obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "cEx" = ( /obj/item/radio/intercom{ @@ -4861,9 +4863,6 @@ req_one_access = list(19,43,67); specialfunctions = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "dxa" = ( @@ -4974,12 +4973,12 @@ /turf/simulated/floor/tiled/dark, /area/triumph/station/stairs_one) "dBB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1 - }, /obj/structure/shuttle/engine/heater{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/shuttle/excursion/general) "dBL" = ( @@ -5245,7 +5244,8 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "dKL" = ( /obj/machinery/power/apc{ @@ -7827,7 +7827,8 @@ pixel_y = -24 }, /obj/machinery/light, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "fsz" = ( /obj/machinery/hologram/holopad, @@ -9589,7 +9590,11 @@ /obj/structure/closet/hydrant{ pixel_y = 32 }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/binary/pump{ + dir = 4; + name = "secondary fuel pump" + }, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "gQL" = ( /obj/machinery/portable_atmospherics/canister/air/airlock, @@ -12777,7 +12782,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "iSk" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ @@ -13656,7 +13661,8 @@ /obj/machinery/recharger/wallcharger{ pixel_x = -24 }, -/turf/simulated/floor/tiled, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "jxs" = ( /obj/structure/cable/green{ @@ -14645,6 +14651,13 @@ }, /turf/simulated/floor/tiled, /area/security/visitor) +"khB" = ( +/obj/structure/shuttle/engine/heater{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/excursion/general) "kim" = ( /obj/structure/table/woodentable, /obj/item/storage/box/glasses/meta, @@ -16341,19 +16354,14 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "ltW" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/structure/cable/cyan{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/binary/pump/on{ - dir = 1; - name = "main fuel pump" - }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "ltY" = ( /obj/structure/cable/green{ @@ -17093,15 +17101,10 @@ /turf/simulated/floor/wood, /area/library) "lTt" = ( -/obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/mech_recharger, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/tank/phoron{ + dir = 8 }, -/obj/mecha/working/hoverpod{ - maxhealth = 300 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "lTz" = ( /obj/structure/cable/green{ @@ -19323,10 +19326,11 @@ /turf/simulated/floor/tiled, /area/bridge/hallway) "ntt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 }, -/turf/simulated/floor/tiled, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "ntB" = ( /turf/simulated/wall/r_wall, @@ -19706,14 +19710,6 @@ /obj/structure/dispenser/oxygen, /turf/simulated/floor/tiled, /area/gateway/prep_room) -"nGw" = ( -/obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/mech_recharger, -/obj/mecha/working/hoverpod{ - maxhealth = 300 - }, -/turf/simulated/floor/tiled, -/area/shuttle/excursion/cargo) "nGR" = ( /obj/machinery/light, /obj/effect/floor_decal/techfloor, @@ -22274,12 +22270,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/chapel) -"pra" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/shuttle/excursion/general) "prc" = ( /obj/effect/floor_decal/spline/fancy{ dir = 5 @@ -22545,7 +22535,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "pBe" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -24146,10 +24136,8 @@ dir = 1; pixel_y = -23 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, -/turf/simulated/floor/tiled, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "qzc" = ( /obj/structure/cable/green{ @@ -24928,11 +24916,12 @@ /turf/simulated/floor/tiled/white, /area/security/forensics) "qXa" = ( +/obj/effect/floor_decal/industrial/outline/red, /obj/machinery/atmospherics/portables_connector{ + dir = 4; name = "Engine Fuel Port" }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "qXb" = ( /turf/simulated/wall/r_wall, @@ -26130,6 +26119,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) +"rFX" = ( +/obj/structure/closet/hydrant{ + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/excursion/cargo) "rGn" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -26160,7 +26158,8 @@ /obj/machinery/autolathe{ hacked = 1 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "rGX" = ( /obj/machinery/door/firedoor/glass, @@ -26757,10 +26756,11 @@ /turf/simulated/floor, /area/shuttle/civvie/general) "sfl" = ( -/obj/machinery/atmospherics/binary/pump{ - name = "secondary fuel pump" +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "sfo" = ( /turf/simulated/floor/tiled/old_cargo/gray, @@ -28131,8 +28131,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 }, -/obj/machinery/meter, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "taH" = ( /obj/machinery/light{ @@ -29188,15 +29187,13 @@ /turf/simulated/floor/wood, /area/lawoffice) "tWp" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/structure/cable/cyan{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "tWS" = ( /obj/machinery/hologram/holopad, @@ -31915,12 +31912,9 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "vIe" = ( -/obj/machinery/atmospherics/pipe/tank/phoron{ - dir = 4; - volume = 30000 - }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled, +/obj/machinery/mech_recharger, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "vIh" = ( /turf/simulated/floor/carpet/sblucarpet, @@ -32751,6 +32745,13 @@ }, /turf/simulated/floor/grass, /area/hydroponics/garden) +"wem" = ( +/obj/machinery/door/airlock/voidcraft/vertical, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/cargo) "wer" = ( /obj/machinery/firealarm{ layer = 3.3; @@ -34357,7 +34358,11 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/civilian_hallway_mid) "xnp" = ( -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/binary/pump/on{ + dir = 8; + name = "main fuel pump" + }, +/turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "xnz" = ( /obj/machinery/button/remote/blast_door{ @@ -39947,8 +39952,8 @@ xnp fzX hYe dwl -pra -jED +hYe +wem jED hYe uKG @@ -40084,12 +40089,12 @@ dls mAF ifm hYe -gQk +rFX fse aDO xsI xsI -aDO +hYe bbp lEt hYe @@ -40227,11 +40232,11 @@ mAF xsI hYe lTt -nGw +lTt aDO xsI xsI -aDO +hYe bbp dZg hYe @@ -40374,7 +40379,7 @@ hjI xsI xsI dBB -mmQ +khB mmQ gxZ oJL diff --git a/code/datums/outfits/misc.dm b/code/datums/outfits/misc.dm index 4a9ebe1124b..5c7cb490390 100644 --- a/code/datums/outfits/misc.dm +++ b/code/datums/outfits/misc.dm @@ -54,8 +54,10 @@ /decl/hierarchy/outfit/merchant/vox //This needs to be updated. name = "Nebula Gas Merchant - Vox" shoes = /obj/item/clothing/shoes/boots/jackboots/toeless + back = /obj/item/tank/vox uniform = /obj/item/clothing/under/vox/vox_robes suit = /obj/item/clothing/suit/armor/vox_scrap + mask = /obj/item/clothing/mask/breath /decl/hierarchy/outfit/zaddat name = "Zaddat Suit" diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index c9173d6d4ab..41626e20748 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -536,3 +536,45 @@ desc = "The fancy utility-belt holding the tools, cuffs and gadgets of the Go Go ERT-Rangers. The belt buckle is not real phoron, but it is still surprisingly comfortable to wear." icon = 'icons/obj/clothing/ranger.dmi' icon_state = "ranger_belt" + +/obj/item/storage/belt/dualholster + name = "dual holster gunbelt" + desc = "Belts like these were popular on old Earth, but were largely supplanted by modular holsters. This gunbelt is too bulky to be comfortably anchored to clothes without support." + icon_state = "dual_holster" + max_w_class = ITEMSIZE_NORMAL + can_hold = list( + /obj/item/gun/energy/alien, + /obj/item/gun/energy/captain, + /obj/item/gun/energy/crossbow, + /obj/item/gun/energy/decloner, + /obj/item/gun/energy/floragun, + /obj/item/gun/energy/gun, + /obj/item/gun/energy/gun/nuclear, + /obj/item/gun/energy/ionrifle/pistol, + /obj/item/gun/energy/lasertag, + /obj/item/gun/energy/netgun, + /obj/item/gun/energy/phasegun/pistol, + /obj/item/gun/energy/pulse_rifle/M1911, + /obj/item/gun/energy/retro, + /obj/item/gun/energy/service, + /obj/item/gun/energy/stunrevolver, + /obj/item/gun/energy/taser, + /obj/item/gun/energy/toxgun, + /obj/item/gun/energy/zip, + /obj/item/gun/projectile/colt, + /obj/item/gun/projectile/contender, + /obj/item/gun/projectile/dartgun, + /obj/item/gun/projectile/deagle, + /obj/item/gun/projectile/derringer, + /obj/item/gun/projectile/gyropistol, + /obj/item/gun/projectile/luger, + /obj/item/gun/projectile/r9, + /obj/item/gun/projectile/revolver, + /obj/item/gun/projectile/sec, + /obj/item/gun/projectile/shotgun/doublebarrel/sawn, + /obj/item/gun/projectile/shotgun/flare, + /obj/item/gun/projectile/silenced, + /obj/item/gun/projectile/p92x, + /obj/item/gun/projectile/pistol, + /obj/item/gun/projectile/pirate + ) diff --git a/code/modules/client/preference_setup/loadout/loadout_event_rewards.dm b/code/modules/client/preference_setup/loadout/loadout_event_rewards.dm index 7f39daafcab..c315b795b0e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_event_rewards.dm +++ b/code/modules/client/preference_setup/loadout/loadout_event_rewards.dm @@ -14,6 +14,6 @@ /datum/gear/event_reward/gameboy sort_category = "Event Rewards" cost = 0 - display_name = "A handheld gaming device from a time long past." + display_name = "Game Boy" path = /obj/item/instrument/gameboy ckeywhitelist = list("jaybird1") diff --git a/code/modules/instruments/instruments/item.dm b/code/modules/instruments/instruments/item.dm index 8e3a5cfc2f8..9668a7168e0 100644 --- a/code/modules/instruments/instruments/item.dm +++ b/code/modules/instruments/instruments/item.dm @@ -320,6 +320,7 @@ return instruments */ +//Event Reward item. /obj/item/instrument/gameboy name = "gameboy" desc = "A bright teal Gameboy Color. This one has a copy of LSDJ slotted into the back. /There's also initals scratched crudely into the lower left hand corner spelling TAS./" diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index 7bf1298482657ef2b1ba64344b894e8db75335c2..ddfc372cf9b809097e9679dc9ed80776db0bc115 100644 GIT binary patch delta 2475 zcmZvc3pAAJAIIOxHFD`#X^H7FXpx!~CS_Qc&5+BoXeG3Yjf`OilkkeNyJ3l@+9c&J zg)+imW>BWTWHjTFJGBhPwQ-pX^X}XBKmYUppYuQGIp=wv_kDi9-}m>v-{(UsL%b?S zWTOxVpXu+EK@O~G9KT65b*{Lh_K`I`%w|omu(<1%wz|0ecoF$g?I{@@TLiQA7yDQR zQ2FLub2~)-3xZ>O<6!sISlfgx=BfWm}o0X7)#iEcZ^b%!S9*eqM?tK z>g3jm4gVnkwo1c@%}sb3Nzc1`F?h)GpD-!Hd|WjmV{!3OBa0HjjIT zFLtFuV|H^LE1O!DwnX?}o*4nG|Kh4-J3>gf-lPa5Oef;HpdSQK$*M!fiZ6{C)h61s z;qCm5HR|8chj{J%Hsm9@M#arJ2efK>-Z52{xp3xOtGFsqIEj?!oT|)n@r-F-3nXI~ zHszh}Ni1f#1R1Kwo5@YJ4Xkiiar%I5!$zwZ*DPN=ZJZp%(9d%?D;|GcCUxn8Zf6NV zdte<6$gx(a5!V)<(|en>)>9Qd6OiB61X@-uefY^1pS*b-HblRWi~y;@4+4ro2~MKXEg+N)1#`MgYJB<#j|)4dMEw7t&Ok zi-v{>#oD$p12V>E;9*lkdg>Gpxcsy)Pxsi}f6W9LvKk*z_kC~Cv(CC8^~ zx1bWaMHU!{m-L6Ba4qLNiRmUqdL>ON0iXJ#rxVzCud3Z2^IyJ^=C*&Lo_{-w0G!+& zc{s%@0sw}k^yR5tPWQ&VMb3{^yMq}!H-{(**vPiPz~MUM{-|5V9i-R`uGoTV=tk|> z&vLARL5ewURRI8kj-B3zgSG|_!(m?Ub1K228hzeTS)SlBQG%}nrIO*e%1)kO+C48I z+7ntIeSB#vyeZaN^BiVRXKJu4tn>pJ+CgC5`|&a9LbIMUa{OtSqz>KET;!WW5`7?8 z%VuR{6o1fj$B<6Sjd3VZF;8%>u)E-{rw)1>QQ)e?u;sg^fqSZcJ<+tEzyFeB-wkcA z`}1LO1Wo@OaDASii#kikoZzv~94ozkEudmog8t5=ci$!`ssa;5VkN>wW3=7G5v~NerI;3 zv}Ywb>=SMS0IJ(u%OrTW?e_hE%Mnfe36O%et}X=y!u0-}s77ClZ$u!h)iW>;!|Fyn zpzA!Yo6ptMHnt5kxxu)J+FFkTZ}kox5toNP-A?~a*_a6c$P(w0oZ_L*@H)SK9qyU6 zLe&|kQr}t9uiXz!thNWfkj{5m<2)sE7G-NZ9T>y!X3tGIkH55du+m1Hb}FrZg!cql zh&M>s7I3FnW-Bw!JM~_EV_8_8KZx4r*2-*5vae5)zHwa>;}o+lY^CAfc8_qqRXY3z z^fm~i#eaM@QZ$u=2V+CSPK6(DGRFw$u%M4HlpT3?D3U$T(-UbCGIs=8yEB``dJ=mU9yF@KT$&-blZahvYEwHS~ zc8^taU=9h+z+*$$MLO###uV2pYod1*0EFez9W^SgUIp&OsES(SaQ{WiaC<@xolhBG zR+G6{+Q-tbpaK6h8xPzL`_806ts3OlXpZ+M-71@gSlt2cP7nd#mfqx;}0x>Uq#<4ZV%zC!DP8ztC=M=hSf4ZeFyy4b?YpY zAvFHnC3-Mg>W>bYsl^EzB!jRO035kct+mC>$_Qr!9<&V2J0c8@WcwVz@uZ*Punjzb zr2`}zZa5$?i!D(rq-T@Hoq5%aFw|^|P2i1%n4s_xs7jQl5+&bG5K=!rTLeSz%W;Da zUvh0j1AuZnmU%k6oT(`d$Z6%j9SAhH*xjVq%Eo#bPZoyMqN#wamZ~rqlCu<<%>9Qbc`2gLV8H&Yb2RAY?RcRa!1Vox8~+y@ d{{x#&2ywndTWEik6AQNt;2hl?s_cSN{st)G>tz4{ delta 2335 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 BIIqWkJkStR~9 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 diff --git a/maps/nsv_triumph/submaps/space/trade_port/tradeport.dmm b/maps/nsv_triumph/submaps/space/trade_port/tradeport.dmm index 14c0c22b880..a4708708c2b 100644 --- a/maps/nsv_triumph/submaps/space/trade_port/tradeport.dmm +++ b/maps/nsv_triumph/submaps/space/trade_port/tradeport.dmm @@ -197,6 +197,12 @@ }, /turf/simulated/floor/wood, /area/triumph_away/tradeport/commons) +"bc" = ( +/obj/structure/largecrate{ + name = "large crate - PRODUCT" + }, +/turf/simulated/floor/tiled/old_tile/red, +/area/triumph_away/tradeport/commhall) "bd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -1334,6 +1340,10 @@ }, /turf/simulated/floor/tiled/old_tile/beige, /area/triumph_away/tradeport/safari) +"hr" = ( +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/plating, +/area/triumph_away/tradeport/commhall) "hx" = ( /obj/machinery/door/firedoor/multi_tile{ req_one_access = list(160) @@ -1411,6 +1421,12 @@ }, /turf/simulated/floor/tiled/old_tile/blue, /area/triumph_away/tradeport/spine) +"hZ" = ( +/obj/structure/largecrate{ + name = "large crate - PRODUCT" + }, +/turf/simulated/floor/plating, +/area/triumph_away/tradeport/commhall) "ia" = ( /obj/structure/table/steel_reinforced, /obj/item/paper_bin{ @@ -1774,6 +1790,10 @@ }, /turf/simulated/floor/carpet/blue, /area/triumph_away/tradeport/commons) +"jA" = ( +/obj/structure/table/rack/shelf/steel, +/turf/simulated/floor/plating, +/area/triumph_away/tradeport/commhall) "jC" = ( /obj/structure/railing, /obj/structure/railing{ @@ -2580,6 +2600,11 @@ /obj/structure/railing, /turf/simulated/mineral/floor/vacuum, /area/space) +"nP" = ( +/obj/structure/table/steel_reinforced, +/obj/item/gun/projectile/shotgun/doublebarrel, +/turf/simulated/floor/plating, +/area/triumph_away/tradeport/commhall) "nS" = ( /obj/structure/railing{ dir = 8 @@ -2852,7 +2877,7 @@ dir = 4 }, /obj/structure/statue/silver/janitor{ - desc = "This statue commemorates Jim for employee of the month."; + desc = "This statue commemorates Farnsworth, the legendary Nebula Gas janitor. Even posthumously, Farnsworth retains the longest consecutive run of employee of the month awards."; name = "Employee of the Month" }, /turf/simulated/floor/tiled/old_cargo/beige, @@ -3442,6 +3467,9 @@ }, /turf/simulated/floor/carpet/blue, /area/triumph_away/tradeport/commons) +"sC" = ( +/turf/simulated/floor/tiled/old_tile/red, +/area/triumph_away/tradeport/commhall) "sD" = ( /obj/structure/railing{ dir = 8 @@ -3513,6 +3541,12 @@ }, /turf/simulated/floor/tiled/neutral, /area/triumph_away/tradeport/commons) +"sX" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/triumph_away/tradeport/commhall) "sY" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -3679,7 +3713,7 @@ frequency = 8018; id = "pumptwo"; name = "Pump Two"; - target_pressure = 1500 + target_pressure = 15000 }, /obj/structure/catwalk, /turf/simulated/floor/airless, @@ -4061,7 +4095,8 @@ dir = 8; frequency = 8018; id = "pumpthree"; - name = "Pump Three" + name = "Pump Three"; + target_pressure = 15000 }, /obj/structure/catwalk, /turf/simulated/floor/airless, @@ -4569,6 +4604,12 @@ }, /turf/space, /area/triumph_away/tradeport/space) +"yb" = ( +/obj/structure/largecrate{ + name = "large crate - SUNDRIES and COMPONENTS" + }, +/turf/simulated/floor/plating, +/area/triumph_away/tradeport/commhall) "yc" = ( /obj/machinery/power/apc/alarms_hidden{ pixel_y = -28; @@ -5049,6 +5090,12 @@ /obj/structure/catwalk, /turf/simulated/mineral/floor/vacuum, /area/space) +"AK" = ( +/obj/machinery/holosign/bar{ + id = "cyndisign" + }, +/turf/simulated/wall/r_wall, +/area/triumph_away/tradeport/commhall) "AM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ @@ -5326,6 +5373,15 @@ }, /turf/simulated/floor/tiled/old_tile/red, /area/triumph_away/tradeport) +"BL" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/largecrate{ + name = "large crate - SUNDRIES and COMPONENTS" + }, +/turf/simulated/floor/plating, +/area/triumph_away/tradeport/commhall) "BO" = ( /obj/machinery/atmospherics/binary/pump/on{ dir = 4 @@ -5683,10 +5739,10 @@ /obj/machinery/door/firedoor{ req_one_access = list(160) }, -/obj/machinery/door/airlock/external/glass{ +/obj/machinery/door/airlock/uranium{ icon_state = "door_locked"; locked = 1; - name = "C&K's - Under Construction" + name = "C&K's - Coming Soon!" }, /turf/simulated/floor/airless, /area/triumph_away/tradeport/commhall) @@ -5954,6 +6010,12 @@ }, /turf/simulated/floor/tiled/steel, /area/triumph_away/tradeport) +"EM" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/old_tile/yellow, +/area/triumph_away/tradeport/safari) "ES" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -5969,6 +6031,10 @@ }, /turf/simulated/floor/tiled/neutral, /area/triumph_away/tradeport/commons) +"EU" = ( +/obj/machinery/light/flicker, +/turf/simulated/floor/plating, +/area/triumph_away/tradeport/commhall) "EY" = ( /obj/structure/table/glass, /obj/item/reagent_containers/food/snacks/milosoup, @@ -6151,6 +6217,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/old_tile/red, /area/triumph_away/tradeport) +"FZ" = ( +/obj/structure/stasis_cage, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/old_tile/beige, +/area/triumph_away/tradeport/safari) "Ga" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -6469,7 +6543,8 @@ dir = 8; frequency = 8018; id = "pumpfive"; - name = "Pump Five" + name = "Pump Five"; + target_pressure = 15000 }, /obj/structure/catwalk, /turf/simulated/floor/airless, @@ -7080,6 +7155,12 @@ /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled/white, /area/triumph_away/tradeport/commons) +"Lh" = ( +/obj/structure/largecrate{ + name = "large crate - SUNDRIES and COMPONENTS" + }, +/turf/simulated/floor/tiled/old_tile/red, +/area/triumph_away/tradeport/commhall) "Li" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -7455,6 +7536,12 @@ /obj/machinery/light, /turf/simulated/floor/tiled/old_tile/red, /area/triumph_away/tradeport/spine) +"Na" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/old_tile/red, +/area/triumph_away/tradeport/commhall) "Nc" = ( /obj/structure/transit_tube/station{ automatic_launch_time = 40 @@ -7627,7 +7714,8 @@ dir = 4; frequency = 8018; id = "pumpfour"; - name = "Pump Four" + name = "Pump Four"; + target_pressure = 15000 }, /obj/structure/catwalk, /turf/simulated/floor/airless, @@ -7806,14 +7894,10 @@ }, /turf/simulated/floor/tiled/old_tile/blue, /area/triumph_away/tradeport) -"OB" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/stasis_cage, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/old_tile/yellow, -/area/triumph_away/tradeport/safari) +"OF" = ( +/obj/structure/barricade, +/turf/simulated/floor/plating, +/area/triumph_away/tradeport/commhall) "OH" = ( /obj/machinery/door/window/westleft{ name = "Storefront"; @@ -8547,7 +8631,7 @@ frequency = 8018; id = "pumpone"; name = "Pump One"; - target_pressure = 1500 + target_pressure = 15000 }, /obj/structure/catwalk, /turf/simulated/floor/airless, @@ -9537,6 +9621,12 @@ }, /turf/simulated/floor/tiled/old_tile/purple, /area/triumph_away/tradeport) +"Xb" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/triumph_away/tradeport/commhall) "Xj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -9551,12 +9641,6 @@ }, /turf/simulated/floor/tiled/old_tile/red, /area/triumph_away/tradeport/spine) -"Xk" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/old_tile/beige, -/area/triumph_away/tradeport/safari) "Xp" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -9750,6 +9834,10 @@ /obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/triumph_away/tradeport/facility) +"Ys" = ( +/obj/structure/table, +/turf/simulated/floor/plating, +/area/triumph_away/tradeport/commhall) "Yt" = ( /obj/structure/table/marble, /obj/machinery/chemical_dispenser/bar_alc/full{ @@ -9872,7 +9960,8 @@ dir = 4; frequency = 8018; id = "pumpsix"; - name = "Pump Six" + name = "Pump Six"; + target_pressure = 15000 }, /obj/structure/catwalk, /turf/simulated/floor/airless, @@ -17175,17 +17264,17 @@ Gg Gg hl hl -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl YG YG YG @@ -17317,19 +17406,19 @@ GV Tm Tm hl -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG +Na +GV +GV +GV +GV +sX +GV +hl +hZ +GV +hl +hl +hl YG YG YG @@ -17459,21 +17548,21 @@ Tm Tm Of hl -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG +GV +GV +GV +Ys +GV +sC +GV +GV +GV +GV +hZ +hZ +hl +hl +hl YG YG YG @@ -17601,22 +17690,22 @@ oc ux Oi hl -kh -kh -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG +hr +nP +Ys +GV +GV +sC +GV +hl +GV +GV +GV +GV +GV +GV +hl +hl YG YG YG @@ -17743,22 +17832,22 @@ Dw Tm Tm hl -kh -kh -YG -kh -kh -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG +GV +sC +sC +sC +GV +GV +sC +hl +GV +sC +sC +GV +GV +GV +GV +hl YG YG YG @@ -17885,22 +17974,22 @@ ZH Tm GV DH -kh -kh -kh -kh -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG +GV +GV +sC +GV +GV +GV +GV +OF +GV +GV +GV +GV +GV +hZ +EU +hl YG YG YG @@ -18026,23 +18115,23 @@ Tm Pu Tm GV +AK +GV +GV +GV +sC +sC +sC +Ys +hl +GV +GV +GV +GV +yb +yb +hZ hl -kh -kh -kh -kh -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG YG YG YG @@ -18169,22 +18258,22 @@ Fi RO dh hl -kh -kh -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG +GV +GV +GV +GV +GV +GV +GV +hl +GV +GV +GV +GV +sC +sC +hl +hl YG YG YG @@ -18299,33 +18388,33 @@ aU tl lt OT -qs +EM Ru qs Ru qs -Ru +FZ hl VO Pu Tm Of hl -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG +GV +sC +sC +sC +GV +GV +Lh +OF +GV +GV +hZ +bc +hl +hl +hl YG YG YG @@ -18441,31 +18530,31 @@ oD kW oS oS -Xk -Ah -Cf -Ah -Cf -OB +oS +oS +oS +oS +oS +oS hl Tm Pu Tm Tm hl -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG +Xb +GV +jA +jA +jA +BL +Lh +hl +GV +hZ +hl +hl +hl YG YG YG @@ -18582,30 +18671,30 @@ tl tl tl GS -oS -oS -oS -oS -oS -oS -oS +YG +YG +YG +YG +YG +YG +YG hl Tm Pu Tm Tm hl -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG -YG +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl YG YG YG