Skip to content

Commit

Permalink
Adds Theia (formerly Fulpstation) Station (#1107)
Browse files Browse the repository at this point in the history
* what

* I have no idea what I'm doing

christ almighty

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* Update Fulpstation.dmm

unfucking things I fucked up earlier

* Update Fulpstation.dmm

bitden area fixed

* Revert "Update Fulpstation.dmm"

This reverts commit bb35cb4.

* Revert "Update Fulpstation.dmm"

This reverts commit 92882db.

* Revert "Update Fulpstation.dmm"

This reverts commit 782b5ae.

* Revert "Update Fulpstation.dmm"

This reverts commit 1728dd4.

* Revert "Update Fulpstation.dmm"

This reverts commit e835424.

* Revert "Update Fulpstation.dmm"

This reverts commit 80cb1b9.

* Revert "Update Fulpstation.dmm"

This reverts commit b4f9396.

* Revert "Revert "Update Fulpstation.dmm""

This reverts commit 35d0ae0.

* Adds cargo shuttle

* fixes cargo shuttle linters issue maybe

* gives engineering a hole

engineering hole

* attempting to fix upperbrig2 issue

* attempt to fix upperbrig2 issue by adding "

* makes it 1 z

* puts commas in the json

* delete random blank spaces

* Update fulpstation.json

* actually makes it 1 z lmao

* fixes docking port, weird issues with atmos pipes getting deleted

* wtf

* Feedback response 1

Removes dead body placers, fixes wiring in disposals, removes walls from under airlocks in the bathroom and chapel, adds button to warehouse , fixing wiring in sci & meatroom, removes squidcloak, adds wardrobe vending drobe, fixes hole in AI upload, allows people to exit medbay and maints

* googa and care's feedback

* Update Fulpstation.dmm

fix AI sats, added windoors and access restrictions

* Fixies

* Nobelium-XVIII's SM fixes

Copy and pasted from Horatio22#2 to prevent merge conflicts

* adds lights, fixes flashes, fixes tube to ai sat

* adds " " on button ID

fixes another string thing

* mm

* Update fulpstation.json

no additional cqc area for chef fuck em

* Update Fulpstation.dmm

fixes some things

* Update Fulpstation.dmm

* Update Fulpstation.dmm

what the fuck

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* tcomms

* arrival shuttle dock

* Update Fulpstation.dmm

* Update Fulpstation.dmm

fixes chapel holes, aligns the toxins pad

* maybe fixes viro doors

* fixes AI sat wiring, maybe fixes HoP buttons

* Update Fulpstation.dmm

* Update Fulpstation.dmm

most areas have decals now

* decals and stuff

* Update Fulpstation.dmm

ugly ass decals no one asked for

* Update Fulpstation.dmm

cable fixes

* Update Fulpstation.dmm

* Update Fulpstation.dmm

fixes double pipes

* Update Fulpstation.dmm

fixes mapcheck issues

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* Fix a bunch of errors

* air alarm in space

* tf

* fixes shuttles for real

* fixes problems with access and more errors

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* Fix a bunch more errors

* Update Fulpstation.dmm

* /datum/unit_test/cable_powernets

fixes these

* add area kitchen hydro

adds kitchen hydroponics area

* maybe fucks up the arrival shuttle

* maybe fucks up the rest of the shuttles lol

* yeehaw

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* rework cargo

removes dept disposal pipes, moves the trash conveyors. "Fixes" the cargo shuttle conveyor belts.

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* Update fulpstation.json

* Update cargo_fulp.dmm

* Update Fulpstation.dmm

* cargo fixes maybe

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* map edits adds area

* decals because idk why the shuttle is fucked

* Update Fulpstation.dmm

more decals because shuttles hard disposals hard I am monkey

* fixes more errors

* fix area, delete fulp cargo shuttle, replace it with helio in json

* attempt at mail pipes

* bad neighbor

* atmos sanity

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* unfucks airlocks from last commit

* fixes the rest of the issues maybe

* adds station direction decals

* fucking oops

* areas

* fix area maybe all issues done now please god please

* puts new area in, gives new areas apc and atmos

* adds nanites

* what the fuck does it mean

* if this doesn't fix it idk what will tbh

* runtimes begone

* fuck

* Update map_templates.dm

* Update Fulpstation.dmm

* showers now work, maybe the last runtime

* fix duct

* Update fulpstation.json

* does this fix the fucking map

* fixes ducts

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* hh

* totally not helio cargo shuttle

* m

* hooray

* Update Fulpstation.dmm

* feedback thread part 2

Fixes most of the issues in the feedback thread:
-docking port
-multiple backwards pipes
-re-wires AI sat (maybe correctly, probably not)
-many, many pipe/ wiring fixes
-solar access
-ai sat atmos
-adds mech. cyborg chargers to engie
-cyborg charger in bathroom
-ATTEMPTS to fix some of the atmos dept issues (lol)
-fixes cargo shuttle conveyor belts

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* fixes of things and such

* Update Fulpstation.dmm

* ord updates

removes pipes from windows in ai sta
adds TTVs and other supplies to ord
changes pipes in ord probably breaks everything

* ai sat changes

makes a second entrance for AI sat
adds holopads to station
adds teleport spawners to station

* give CE tcomms paper

gives captain a comms console
fixes some pipes
CE office now has tcomms paper
fixes access issues on some security doors

* fix pipes

* adds lattices

* deletes bad neighbor

* adds space walk/ ai sat protection

* fix bad neighbor again

* yeah

* Fixes

* feedback from forums

* 2.28 feedback fixes

-perma changes
-re-arranged kitchen
-LOTS of cable fixes
-fixes directions for robo and chapel items
-access fixes

* fixes cables and bad neighbors

* execution chamber windows fixed

* cables again

* rec and arrival area changes

- shortens hall near public mining
-makes a public tunnel between fitness room and holodeck
-adds MORE directional signs for evac
seriously if you miss it there is nothing more I can do to help you

* gives stamps

* more fixes

lights in lounge
cable issues
gives everyone stamps who needs them probably

* yet more fixes, adds signs, labels some airlocks

* makes ord work

* fixes things, decals, tiles, shit is purple now

* 2 lights 1 tile

* forgot the floor

* more decals while I wait for tests to work

* wtf is up with that light idk

* fix space

* fuck off

* gives ce an actual request console

* lights and decals

* Update Fulpstation.dmm

* removes soul

* even more soul

* more soul

* adds surgery tools

* bad neighbor

* black light

* removes cell 3 doors

* Update Fulpstation.dmm

* Update Fulpstation.dmm

* fixes windoors

* Update Fulpstation.dmm

* fucking windoors

* christ

* nav beacon attempt1

* cargo fixes (hopefully)

* cargo changes

* forum feedback, fixes error

-bar lounge now is connected to power
-fixes access issues with xenobio
-moves buttons in turbine, med maints
-renames turbine door
-moves turbine computer
-gives hydroponics a seed extractor

* forum feedback 3.12

-adds more displays to AI sat
-fixes crematorium button
-gives HoP incredment counter

* renames Fulp Station to Theia Station

* correctly names dmm

* decals

* lowercase json

* update the damn json please

* Update Theiastation.json

* stop making it fucking capital jesus h christ

* ugh

* Update theiastation.json

* Throws science around

* Update TheiaStation.dmm

* why did you break my linters john

* fixes

* forum feedback 3.16.24

* fix quad wall

* Science fixes reported from forums

* Forum feedback 3.19.24

* Forum feedback 3.22

Finally adds bridge fireaxe
Fixes large library paintings

* theia fixes

* comms fix

* Update TheiaStation.dmm

* adds another access side to atmos, fixes some r_walls

* Revert "adds another access side to atmos, fixes some r_walls"

This reverts commit 279cad0.

* Revert "Merge branch 'fulpmap24' of https://github.com/Horatio22/fulpstation into fulpmap24"

This reverts commit 51bf566, reversing
changes made to 279cad0.

* adds event spawners, moves whiteship dock/adds ert dock, removes useless chute outlet, fixes warden lightswitch

* fixes conveyors

* Xeniobio monkey box and cytology locker

* adds secure storage btn

* engi airlock cycles

* rm space cameras

* ad engi showers

* morgue tools

* fx solar smes in/out direction

* ad camera brig entrence

* ad cargo blast access

* fix railings

* Update areas.dm

---------

Co-authored-by: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Pepsilawn <reisenrui@gmail.com>
Co-authored-by: SgtHunk <68669754+SgtHunk@users.noreply.github.com>
Co-authored-by: Bilbo367 <163439532+Bilbo367@users.noreply.github.com>
  • Loading branch information
5 people authored Apr 29, 2024
1 parent 629202f commit a4ae8ba
Show file tree
Hide file tree
Showing 10 changed files with 124,062 additions and 5 deletions.
123,456 changes: 123,456 additions & 0 deletions _maps/map_files/TheiaStation/TheiaStation.dmm

Large diffs are not rendered by default.

224 changes: 224 additions & 0 deletions _maps/shuttles/arrival_fulp.dmm
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"b" = (
/obj/machinery/vending/wallmed/directional/north,
/turf/open/floor/mineral/titanium/tiled/white,
/area/shuttle/arrival)
"e" = (
/turf/open/floor/mineral/titanium/tiled/white,
/area/shuttle/arrival)
"g" = (
/obj/machinery/power/shuttle_engine/propulsion/burst/left{
dir = 4
},
/obj/docking_port/mobile/arrivals,
/turf/open/floor/plating/airless,
/area/shuttle/arrival)
"l" = (
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/mineral/titanium/tiled/purple,
/area/shuttle/arrival)
"p" = (
/obj/item/radio/intercom/directional/south,
/turf/open/floor/mineral/titanium/tiled/purple,
/area/shuttle/arrival)
"s" = (
/obj/machinery/power/shuttle_engine/propulsion/burst/left{
dir = 4
},
/turf/open/floor/plating/airless,
/area/shuttle/arrival)
"v" = (
/obj/machinery/light/small/directional/south,
/turf/open/floor/mineral/titanium/tiled/white,
/area/shuttle/arrival)
"w" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating,
/area/shuttle/arrival)
"x" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/tiled/purple,
/area/shuttle/arrival)
"B" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/tiled/purple,
/area/shuttle/arrival)
"E" = (
/obj/machinery/power/shuttle_engine/heater{
dir = 4
},
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/plating/airless,
/area/shuttle/arrival)
"F" = (
/obj/item/radio/intercom/directional/north,
/turf/open/floor/mineral/titanium/tiled/purple,
/area/shuttle/arrival)
"G" = (
/obj/machinery/door/airlock/titanium{
name = "Arrivals Shuttle Airlock"
},
/turf/open/floor/mineral/titanium/tiled/white,
/area/shuttle/arrival)
"H" = (
/turf/closed/wall/mineral/titanium/overspace,
/area/shuttle/arrival)
"L" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/machinery/light/small/directional/north,
/turf/open/floor/mineral/titanium/tiled/purple,
/area/shuttle/arrival)
"M" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/machinery/light/directional/south,
/turf/open/floor/mineral/titanium/tiled/purple,
/area/shuttle/arrival)
"N" = (
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/mineral/titanium/tiled/purple,
/area/shuttle/arrival)
"P" = (
/turf/open/floor/mineral/titanium/tiled/purple,
/area/shuttle/arrival)
"R" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/machinery/light/directional/west,
/turf/open/floor/mineral/titanium/tiled/purple,
/area/shuttle/arrival)
"W" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/machinery/light/small/directional/south,
/turf/open/floor/mineral/titanium/tiled/purple,
/area/shuttle/arrival)
"X" = (
/obj/structure/closet/emcloset,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/storage/medkit/o2,
/obj/structure/window/reinforced/spawner/directional/west,
/obj/item/crowbar,
/turf/open/floor/mineral/titanium/tiled/white,
/area/shuttle/arrival)
"Z" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/arrival)

(1,1,1) = {"
Z
w
w
w
Z
"}
(2,1,1) = {"
Z
B
R
B
Z
"}
(3,1,1) = {"
G
e
e
e
G
"}
(4,1,1) = {"
Z
F
e
N
Z
"}
(5,1,1) = {"
w
x
e
x
w
"}
(6,1,1) = {"
w
x
e
M
w
"}
(7,1,1) = {"
w
x
e
x
w
"}
(8,1,1) = {"
Z
P
e
P
Z
"}
(9,1,1) = {"
G
e
e
e
G
"}
(10,1,1) = {"
Z
l
e
p
Z
"}
(11,1,1) = {"
w
L
e
W
w
"}
(12,1,1) = {"
w
X
e
X
w
"}
(13,1,1) = {"
Z
b
e
v
Z
"}
(14,1,1) = {"
Z
E
E
E
Z
"}
(15,1,1) = {"
H
s
g
s
H
"}
Loading

0 comments on commit a4ae8ba

Please sign in to comment.