Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Talos little tweaks. #82

Merged
merged 6 commits into from
Aug 15, 2024
Merged

Talos little tweaks. #82

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ece157c
Update TGS_Talos.dmm
Helg2 Aug 14, 2024
5fdb9ca
make ob fuel stand even
Helg2 Aug 14, 2024
064d0cb
move barrel a bit
Helg2 Aug 14, 2024
4c66ff6
fix ai windows
Helg2 Aug 14, 2024
1176d71
move chairs in cabinets
Helg2 Aug 14, 2024
53e6059
move stuff to locker
Helg2 Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 59 additions & 76 deletions _maps/map_files/Talos/TGS_Talos.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,6 +1215,11 @@
/obj/effect/turf_decal/woodsiding,
/obj/structure/closet/cabinet,
/obj/item/reagent_containers/glass/beaker/bluespace,
/obj/effect/spawner/random/clothing/hats,
/obj/item/clothing/tie/red,
/obj/item/weapon/cane,
/obj/item/storage/briefcase,
/obj/item/reagent_containers/food/drinks/flask/barflask,
/turf/open/floor/carpet,
/area/mainship/living/numbertwobunks)
"aCk" = (
Expand Down Expand Up @@ -5919,7 +5924,6 @@
/turf/open/floor/mainship/metal,
/area/mainship/hallways/aft_hallway)
"dqV" = (
/obj/structure/window/reinforced/extratoughened,
/obj/effect/ai_node,
/turf/open/floor/mainship/tcomms,
/area/mainship/living/numbertwobunks)
Expand Down Expand Up @@ -6365,7 +6369,6 @@
/turf/open/floor/mainship/metal,
/area/mainship/hallways/hangar)
"dEx" = (
/obj/structure/bed/chair/comfy,
/obj/machinery/light/mainship{
dir = 1
},
Expand Down Expand Up @@ -7209,9 +7212,6 @@
pixel_y = -19;
pixel_x = -8
},
/obj/structure/sign/semiotic/intercom{
pixel_y = -25
},
/turf/open/floor/plating/plating_catwalk/dark,
/area/mainship/hallways/hangar)
"ehP" = (
Expand Down Expand Up @@ -7562,17 +7562,13 @@
/area/mainship/living/grunt_rnr)
"eqR" = (
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison/marked,
/area/mainship/shipboard/weapon_room)
"eqT" = (
Expand Down Expand Up @@ -8526,9 +8522,6 @@
pixel_y = -19;
pixel_x = -8
},
/obj/structure/sign/semiotic/intercom{
pixel_y = -25
},
/turf/open/floor/plating/plating_catwalk/dark,
/area/mainship/hallways/hangar)
"eRE" = (
Expand Down Expand Up @@ -16027,10 +16020,11 @@
"jQj" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/effect/decal/cleanable/dirt,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/turf/open/floor/prison/marked,
Expand Down Expand Up @@ -16298,14 +16292,7 @@
dir = 6
},
/obj/structure/cable,
/obj/item/radio/intercom/general{
pixel_y = -20;
pixel_x = -24
},
/obj/structure/sign/semiotic/intercom{
pixel_y = 24;
pixel_x = 15
},
/obj/item/radio/intercom/general,
/turf/open/floor/plating/plating_catwalk/dark,
/area/mainship/hallways/hangar)
"jWC" = (
Expand Down Expand Up @@ -16956,10 +16943,6 @@
/turf/open/floor/mainship/metal,
/area/mainship/hallways/port_hallway)
"kqo" = (
/obj/item/radio/intercom/general{
pixel_y = -20;
pixel_x = -24
},
/obj/structure/sign/semiotic/intercom{
pixel_y = 24;
pixel_x = 15
Expand Down Expand Up @@ -20564,10 +20547,6 @@
dir = 8
},
/obj/structure/cable,
/obj/item/radio/intercom/general{
pixel_y = -20;
pixel_x = -24
},
/obj/structure/sign/semiotic/intercom{
pixel_y = 24;
pixel_x = 15
Expand Down Expand Up @@ -22454,6 +22433,12 @@
/obj/machinery/telecomms/server/presets/requisitions,
/turf/open/floor/mainship/silver/full,
/area/mainship/command/telecomms)
"npi" = (
/obj/structure/sign/semiotic/intercom{
pixel_y = -25
},
/turf/open/floor/plating/plating_catwalk/dark,
/area/mainship/hallways/hangar)
"npv" = (
/obj/structure/table/black,
/turf/open/floor/mainship/red/full,
Expand Down Expand Up @@ -22851,12 +22836,9 @@
/turf/open/floor/mainship/red/full,
/area/mainship/shipboard/brig)
"nCj" = (
/obj/structure/largecrate/random/barrel,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plating,
/area/mainship/hull/port_hull)
/obj/item/radio/intercom/general,
/turf/open/floor/plating/plating_catwalk/dark,
/area/mainship/hallways/hangar)
"nCw" = (
/obj/machinery/light/mainship/small{
dir = 1
Expand Down Expand Up @@ -23116,12 +23098,6 @@
},
/turf/open/floor/prison/marked,
/area/mainship/squads/req)
"nLU" = (
/obj/structure/window/reinforced/extratoughened{
dir = 4
},
/turf/open/floor/mainship/tcomms,
/area/mainship/living/numbertwobunks)
"nMi" = (
/obj/effect/turf_decal/siding/metal/corner,
/turf/open/floor/mainship/metal,
Expand Down Expand Up @@ -23983,6 +23959,16 @@
"okm" = (
/obj/effect/landmark/start/job/ai,
/obj/machinery/floor_warn_light/self_destruct,
/obj/structure/window/reinforced/extratoughened{
dir = 1
},
/obj/structure/window/reinforced/extratoughened,
/obj/structure/window/reinforced/extratoughened{
dir = 8
},
/obj/structure/window/reinforced/extratoughened{
dir = 4
},
/turf/open/floor/mainship/tcomms,
/area/mainship/living/numbertwobunks)
"oky" = (
Expand Down Expand Up @@ -24238,12 +24224,6 @@
color = "#53876F"
},
/area/mainship/medical/upper_medical)
"osR" = (
/obj/structure/window/reinforced/extratoughened{
dir = 8
},
/turf/open/floor/mainship/tcomms,
/area/mainship/living/numbertwobunks)
"otu" = (
/obj/machinery/firealarm{
dir = 8
Expand Down Expand Up @@ -24289,12 +24269,6 @@
color = "#53876F"
},
/area/mainship/medical/surgery_hallway)
"ouy" = (
/obj/structure/window/reinforced/extratoughened{
dir = 1
},
/turf/open/floor/mainship/tcomms,
/area/mainship/living/numbertwobunks)
"ouH" = (
/obj/machinery/vending/engivend,
/obj/machinery/light/mainship{
Expand Down Expand Up @@ -25430,6 +25404,9 @@
dir = 6
},
/obj/effect/ai_node,
/obj/structure/bed/chair/comfy{
dir = 8
},
/turf/open/floor/wood,
/area/mainship/living/numbertwobunks)
"phm" = (
Expand Down Expand Up @@ -25529,6 +25506,17 @@
/obj/machinery/atmospherics/pipe/manifold4w/cyan/hidden/layer1,
/turf/open/floor/plating/plating_catwalk/dark,
/area/mainship/squads/bravo)
"piP" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{
dir = 5
},
/obj/structure/cable,
/obj/structure/largecrate/random/barrel,
/turf/open/floor/plating,
/area/mainship/hull/port_hull)
"pja" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
Expand Down Expand Up @@ -25667,10 +25655,13 @@
/turf/open/floor/mainship/metal,
/area/mainship/squads/bravo)
"pnQ" = (
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/rack,
/obj/machinery/light/mainship/small,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/turf/open/floor/prison/marked,
/area/mainship/shipboard/weapon_room)
"pnY" = (
Expand Down Expand Up @@ -29043,12 +29034,6 @@
/obj/structure/cable,
/turf/open/floor/mainship/metal/full,
/area/mainship/living/grunt_rnr)
"rlC" = (
/obj/structure/bed/chair/comfy{
dir = 8
},
/turf/open/floor/carpet,
/area/mainship/command/corporateliaison)
"rmq" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/alt{
dir = 4
Expand Down Expand Up @@ -33529,6 +33514,9 @@
dir = 1
},
/obj/structure/cable,
/obj/structure/sign/semiotic/intercom{
pixel_y = -25
},
/turf/open/floor/plating/plating_catwalk/dark,
/area/mainship/hallways/hangar)
"uge" = (
Expand Down Expand Up @@ -33980,15 +33968,10 @@
/area/mainship/shipboard/ex_firing_range)
"uty" = (
/obj/structure/table/fancywoodentable,
/obj/item/reagent_containers/food/drinks/flask/barflask,
/obj/item/storage/briefcase,
/obj/item/megaphone,
/obj/item/clothing/tie/red,
/obj/item/weapon/cane,
/obj/effect/turf_decal/woodsiding{
dir = 6
},
/obj/effect/spawner/random/clothing/hats,
/turf/open/floor/carpet,
/area/mainship/living/numbertwobunks)
"utP" = (
Expand Down Expand Up @@ -38302,12 +38285,12 @@
/turf/open/floor/mainship/metal/full,
/area/mainship/hallways/bow_hallway)
"xgx" = (
/obj/structure/rack,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/rack,
/turf/open/floor/prison/marked,
/area/mainship/shipboard/weapon_room)
"xhd" = (
Expand Down Expand Up @@ -70418,7 +70401,7 @@ yjt
yjt
dRT
ppr
rlC
eid
yhU
oOC
wby
Expand Down Expand Up @@ -71852,11 +71835,11 @@ pSr
pSr
ikp
hXx
hXx
npi
qMe
etc
qMe
kqo
nCj
hXx
lLD
lOm
Expand Down Expand Up @@ -71891,7 +71874,7 @@ pSR
wnT
gyt
paH
avX
piP
xFv
dnv
dnv
Expand Down Expand Up @@ -72404,7 +72387,7 @@ prI
xIF
eba
naE
nCj
uOG
aye
gJe
gJe
Expand Down Expand Up @@ -73784,7 +73767,7 @@ xiO
kWP
qOp
qOp
nLU
qOp
qOp
qOp
xOs
Expand Down Expand Up @@ -74042,7 +74025,7 @@ usm
qOp
dqV
okm
ouy
qOp
pOe
xOs
uNB
Expand Down Expand Up @@ -74298,7 +74281,7 @@ xiO
usm
qOp
qOp
osR
qOp
qOp
qOp
xOs
Expand Down
Loading