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.

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

Respriting something #210

Merged
merged 25 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2ed41eb
Update map_blips_large.dmi
CarpHead Aug 30, 2024
d3459ab
Merge branch 'PMC-Unga-Marines:master' into master
CarpHead Sep 3, 2024
75cac1f
Merge branch 'PMC-Unga-Marines:master' into master
CarpHead Sep 4, 2024
0a20547
Merge branch 'PMC-Unga-Marines:master' into Respriting
CarpHead Sep 4, 2024
8c9c54b
Merge branch 'PMC-Unga-Marines:master' into master
CarpHead Sep 4, 2024
68f9cc5
123
CarpHead Sep 4, 2024
6c136e0
Merge branch 'Respriting' of https://github.com/CarpHead/RuTGMC-Rebor…
CarpHead Sep 4, 2024
17f6079
Merge pull request #1 from CarpHead/Respriting
CarpHead Sep 4, 2024
4f5b0fc
tcomm-marks
CarpHead Sep 4, 2024
8e443ae
Merge pull request #2 from CarpHead/Respriting
CarpHead Sep 4, 2024
93aa124
123
CarpHead Sep 4, 2024
3dd9476
Merge branch 'master' of https://github.com/CarpHead/RuTGMC-Reborn
CarpHead Sep 4, 2024
ce6bae5
1
CarpHead Sep 4, 2024
b13d195
Merge branch 'master' into master
CarpHead Sep 5, 2024
32bdc16
Props
CarpHead Sep 5, 2024
f509030
Merge branch 'master' of https://github.com/CarpHead/RuTGMC-Reborn
CarpHead Sep 5, 2024
66ac7f5
WY logo
CarpHead Sep 5, 2024
0b09b9f
Maps redacted
CarpHead Sep 8, 2024
03c7f8e
Merge branch 'master' into master
CarpHead Sep 8, 2024
7092d70
Fix map
CarpHead Sep 8, 2024
be01543
Merge branch 'master' of https://github.com/CarpHead/RuTGMC-Reborn
CarpHead Sep 8, 2024
68cde8e
FIX MAP
CarpHead Sep 8, 2024
cbe886a
Rocket pod
CarpHead Sep 8, 2024
46647c4
Talos
CarpHead Sep 8, 2024
9db45ab
Merge branch 'master' into master
Helg2 Sep 8, 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
36 changes: 14 additions & 22 deletions _maps/map_files/Arachne/TGS_Arachne.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6097,10 +6097,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hull/port_hull)
"fjN" = (
/obj/structure/prop/mainship/name_stencil/M,
/turf/open/floor/mainship_hull,
/area/space)
"fki" = (
/obj/machinery/camera/autoname/mainship{
dir = 1
Expand Down Expand Up @@ -6134,7 +6130,7 @@
/area/mainship/living/starboard_garden)
"fkW" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/mainship/ntlogo/nt2,
/turf/open/floor/mainship/wylogo/wy2,
/area/mainship/medical/upper_medical)
"fld" = (
/obj/structure/window/reinforced{
Expand Down Expand Up @@ -8853,7 +8849,7 @@
/turf/open/floor/mainship/mono,
/area/mainship/living/tankerbunks)
"hBd" = (
/obj/structure/prop/mainship/name_stencil/G,
/obj/structure/prop/mainship/name_stencil/P,
/turf/open/floor/mainship_hull,
/area/space)
"hBs" = (
Expand Down Expand Up @@ -16907,7 +16903,7 @@
/area/mainship/medical/chemistry)
"nVh" = (
/obj/structure/cable,
/turf/open/floor/mainship/ntlogo,
/turf/open/floor/mainship/wylogo,
/area/mainship/medical/upper_medical)
"nVu" = (
/obj/structure/disposalpipe/segment,
Expand Down Expand Up @@ -24320,7 +24316,7 @@
"ush" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/mainship/ntlogo/nt3,
/turf/open/floor/mainship/wylogo/wy3,
/area/mainship/medical/upper_medical)
"usx" = (
/obj/effect/decal/cleanable/blood/oil{
Expand Down Expand Up @@ -25810,7 +25806,7 @@
/turf/open/floor/mainship/floor,
/area/mainship/hallways/hangar/droppod)
"vED" = (
/obj/structure/prop/mainship/name_stencil/T,
/obj/structure/prop/mainship/name_stencil/U,
/turf/open/floor/mainship_hull,
/area/space)
"vEN" = (
Expand Down Expand Up @@ -28382,10 +28378,6 @@
dir = 4
},
/area/mainship/hallways/hangar)
"xPl" = (
/obj/structure/prop/mainship/name_stencil/C,
/turf/open/floor/mainship_hull,
/area/space)
"xPo" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
Expand Down Expand Up @@ -36123,7 +36115,7 @@ vkb
vkb
vkb
vkb
vED
vkb
vkb
vkb
jUe
Expand Down Expand Up @@ -36225,7 +36217,7 @@ mUw
mUw
pOz
vkb
vkb
vED
vkb
mPj
kqS
Expand Down Expand Up @@ -36429,7 +36421,7 @@ yih
oSy
vkb
vkb
hBd
vkb
vkb
mPj
kqS
Expand Down Expand Up @@ -36531,7 +36523,7 @@ vgE
oSy
vkb
vkb
vkb
hBd
vkb
lYK
noK
Expand Down Expand Up @@ -36735,7 +36727,7 @@ bze
oSy
vkb
vkb
fjN
vkb
vkb
mPj
kqS
Expand Down Expand Up @@ -36837,7 +36829,7 @@ bze
oSy
vkb
vkb
vkb
hBd
vkb
lYK
noK
Expand Down Expand Up @@ -37041,7 +37033,7 @@ mUw
mUw
pOz
vkb
xPl
vkb
vkb
lYK
noK
Expand Down Expand Up @@ -42587,10 +42579,10 @@ vkb
hBd
vkb
vkb
fjN
hBd
vkb
vkb
vkb
xPl
vkb
vkb
vkb
Expand Down
12 changes: 6 additions & 6 deletions _maps/map_files/Magmoor_Digsite_IV/Magmoor_Digsite_IV.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9982,7 +9982,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 5
},
/turf/open/floor/mainship/ntlogo/nt3,
/turf/open/floor/mainship/wylogo/wy3,
/area/magmoor/civilian/arrival)
"hgJ" = (
/obj/structure/table/woodentable,
Expand Down Expand Up @@ -10949,7 +10949,7 @@
/turf/open/floor/plating,
/area/magmoor/compound/north)
"hWC" = (
/turf/open/floor/mainship/ntlogo/nt3,
/turf/open/floor/mainship/wylogo/wy3,
/area/magmoor/civilian/arrival/east)
"hWD" = (
/obj/structure/closet/crate/freezer/rations,
Expand Down Expand Up @@ -11409,7 +11409,7 @@
"ilS" = (
/obj/structure/barricade/wooden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/mainship/ntlogo/nt2,
/turf/open/floor/mainship/wylogo/wy2,
/area/magmoor/civilian/arrival/east)
"img" = (
/obj/machinery/bodyscanner,
Expand Down Expand Up @@ -24269,7 +24269,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/mainship/ntlogo/nt2,
/turf/open/floor/mainship/wylogo/wy2,
/area/magmoor/civilian/arrival)
"rMh" = (
/obj/structure/closet/secure_closet/freezer/fridge,
Expand Down Expand Up @@ -28628,7 +28628,7 @@
/area/magmoor/cargo/processing/south)
"uSP" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/turf/open/floor/mainship/ntlogo,
/turf/open/floor/mainship/wylogo,
/area/magmoor/civilian/arrival/east)
"uTa" = (
/turf/open/floor/mainship/emerald{
Expand Down Expand Up @@ -29389,7 +29389,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
/turf/open/floor/mainship/ntlogo,
/turf/open/floor/mainship/wylogo,
/area/magmoor/civilian/arrival)
"vzw" = (
/obj/structure/cable,
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/Orion_Military_Outpost/orionoutpost.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@
/obj/structure/bed/chair/dropship/passenger{
dir = 8
},
/turf/open/floor/mainship/ntlogo/nt3,
/turf/open/floor/mainship/wylogo/wy3,
/area/orion_outpost/ground/outpostse)
"ct" = (
/obj/effect/landmark/start/job/survivor,
Expand Down Expand Up @@ -3225,7 +3225,7 @@
/obj/structure/bed/chair/dropship/passenger{
dir = 4
},
/turf/open/floor/mainship/ntlogo,
/turf/open/floor/mainship/wylogo,
/area/orion_outpost/ground/outpostse)
"qv" = (
/obj/structure/cable,
Expand Down Expand Up @@ -6892,7 +6892,7 @@
/turf/open/floor/plating/ground/concrete,
/area/orion_outpost/surface/building/vehicledepot)
"Jk" = (
/turf/open/floor/mainship/ntlogo/nt2,
/turf/open/floor/mainship/wylogo/wy2,
/area/orion_outpost/ground/outpostse)
"Jl" = (
/obj/structure/shuttle/engine/propulsion/burst/left,
Expand Down
Loading
Loading