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

Steel Station, a new large station for the map rotation! #938

Closed
wants to merge 167 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
167 commits
Select commit Hold shift + click to select a range
e7e4fea
Map Exists
Killermankey Dec 1, 2023
b001a5a
Maint 2 Update
Killermankey Dec 1, 2023
0b00205
Delete SteelStation.dmm
Killermankey Dec 1, 2023
9978e56
Create SteelStationcopyandpaste.dmm
Yobrocharlie Dec 1, 2023
c41f58b
EeepyCheep
Killermankey Dec 1, 2023
9e95760
AHHHH
Killermankey Dec 1, 2023
eb13ba1
SM is made
Killermankey Dec 1, 2023
3d63494
Sm Spesified
Killermankey Dec 1, 2023
b5c95cf
Updata
Killermankey Dec 2, 2023
1a6a8fa
Sec Except Perma Built. Still no atmos lol, or ai cams really.
Killermankey Dec 2, 2023
417c844
Moar Sec
Killermankey Dec 2, 2023
cc6af25
Update SteelStationcopyandpaste.dmm
Yobrocharlie Dec 2, 2023
4d39fde
Update SteelStation.dmm
Killermankey Dec 2, 2023
01a121d
Chapel Exists now. Also a bit of medbay built
Killermankey Dec 2, 2023
b01616e
Update SteelStation.dmm
Killermankey Dec 2, 2023
4171a43
Merge branch 'SteelStation' of https://github.com/Killermankey/Monkes…
Killermankey Dec 2, 2023
dee9052
Dont explode on me
Killermankey Dec 3, 2023
ee16b8c
Service 90% made
Killermankey Dec 3, 2023
4bcc467
Front of Sci Built
Killermankey Dec 4, 2023
8c5dba2
More of science done
Killermankey Dec 6, 2023
1582643
Update SteelStation.dmm
Killermankey Dec 14, 2023
ccf05cc
Update SteelStation.dmm
Killermankey Dec 14, 2023
5e28858
Research Done
Killermankey Dec 14, 2023
62a019c
Evac and Arrivals work now
Killermankey Dec 14, 2023
7b5258b
Dorms is ballin
Killermankey Dec 14, 2023
5a1c5d4
Port Stern Maint
Killermankey Dec 14, 2023
7691c0a
Port Aft* Maint
Killermankey Dec 14, 2023
c20141e
Disposals Revolution (Dorms, Service, Research)
Killermankey Dec 14, 2023
e697395
Only thing left is AI sat and atmos
Killermankey Dec 16, 2023
132b996
AI sat exists, Bearly TIME FOR DA ATMOS!!
Killermankey Dec 16, 2023
d5dae8c
Distro built, but nothings been distributed yet.
Killermankey Dec 16, 2023
0b5094d
Interdepartmental Pipes layed, no intrapipes or actual outputs
Killermankey Dec 16, 2023
0be85f8
Cargo+fore Atmos
Killermankey Dec 18, 2023
039cd8c
Engie Atmos and AI upload
Killermankey Dec 18, 2023
e844962
Secmos
Killermankey Dec 19, 2023
2ff7475
Med,Lib,Chap mos
Killermankey Dec 19, 2023
d43a622
Service + Sciencemos
Killermankey Dec 20, 2023
742f5d2
Atmos spread, some fixes, Cam&light now
Killermankey Dec 21, 2023
0531465
Lighting Probably good
Killermankey Dec 21, 2023
37c119e
Viva la Cams n Lights
Killermankey Dec 21, 2023
7125f9a
Beta V1
Killermankey Dec 21, 2023
c178dc1
Actually Beta V1
Killermankey Dec 21, 2023
179ffa7
SM has cams n lights
Killermankey Dec 21, 2023
c99b454
Moar lights n Lattice
Killermankey Dec 21, 2023
3bda4d9
tweaks n touches
Killermankey Jan 12, 2024
343d9cf
Moved to be properly inline with other maps
Killermankey Jan 13, 2024
fe40090
Cleaning PR
Killermankey Jan 13, 2024
976997e
Fixes N suggestions #1
Killermankey Jan 13, 2024
8a8866c
Update SteelStation.dmm
Killermankey Jan 13, 2024
7973b08
Fixed dorms maybe?
Killermankey Jan 13, 2024
54a907a
Create Steelstation.json
Killermankey Jan 13, 2024
87bc341
Now I can feel it! (adds fire alarms)
Killermankey Jan 13, 2024
80eb20a
fixed fucky description
Killermankey Jan 13, 2024
45bf5cc
Trying to make the SM work better
Killermankey Jan 13, 2024
bd0d07d
Update SteelStation.dmm
Killermankey Jan 13, 2024
1436d6c
Update SteelStation.dmm
Killermankey Jan 14, 2024
37cd2bb
Departmental Beautification
Killermankey Jan 14, 2024
9fde6f0
Moar Flora and some fauna
Killermankey Jan 17, 2024
1ef16f4
Damn json wont rename to properly pass check
Killermankey Jan 17, 2024
4c41303
There we go!
Killermankey Jan 17, 2024
d904253
Github Suggestions
Killermankey Jan 18, 2024
da38258
maint spawn
Killermankey Jan 21, 2024
8a1b8d4
Det,law,art,tech,cryo exist now
Killermankey Jan 23, 2024
db76150
the xenobio now has a working kill chamber
Killermankey Jan 23, 2024
07e0266
Better AI sat & other tingies
Killermankey Jan 30, 2024
9d1e6ca
decor
Killermankey Feb 6, 2024
9bb0145
test
wraith-54321 Feb 9, 2024
907897b
works
wraith-54321 Feb 11, 2024
264239d
It now fits within 255x255!
Killermankey Feb 20, 2024
264d11c
Beautification and dirtifcation
Killermankey Feb 20, 2024
c8bd7eb
Merge branch 'SteelStation' of https://github.com/Killermankey/McStea…
Killermankey Feb 20, 2024
ca0aef8
Me done for now
Killermankey Feb 20, 2024
b486dfb
Kitchen rework + fire safety
Killermankey Feb 26, 2024
3443c11
Update SteelStation.dmm
Killermankey Feb 27, 2024
cf3c9b1
Hallway improvements
Killermankey Feb 29, 2024
20524f2
having others look at it helps
Killermankey Mar 1, 2024
271cab2
Update SteelStation.dmm
Killermankey Mar 2, 2024
c8304e5
Coder Compliance
Killermankey Mar 2, 2024
4d91284
Gahhhh, more fixes I spotted
Killermankey Mar 2, 2024
bd56674
Merge branch 'Monkestation:master' into SteelStation
Killermankey Mar 2, 2024
4fba1af
job compliance
Killermankey Mar 2, 2024
5efd77d
Update SteelStation.dmm
Killermankey Mar 2, 2024
51e0b18
Update SteelStation.dmm
Killermankey Mar 2, 2024
2ff900d
Update SteelStation.dmm
Killermankey Mar 2, 2024
a3a7ae1
Update SteelStation.dmm
Killermankey Mar 2, 2024
1402172
Update SteelStation.dmm
Killermankey Mar 2, 2024
26fa186
Update SteelStation.dmm
Killermankey Mar 2, 2024
e61355f
Update SteelStation.dmm
Killermankey Mar 2, 2024
3b4a604
Update SteelStation.dmm
Killermankey Mar 3, 2024
cf27e57
Update SteelStation.dmm
Killermankey Mar 3, 2024
00e12a1
AHHHH!!!
Killermankey Mar 3, 2024
66b6a8a
Update SteelStation.dmm
Killermankey Mar 3, 2024
a8c42cc
Update SteelStation.dmm
Killermankey Mar 3, 2024
52bda6f
Update SteelStation.dmm
Killermankey Mar 3, 2024
2066599
Maybe?
Killermankey Mar 3, 2024
943fc96
Update SteelStation.dmm
Killermankey Mar 3, 2024
5d008a3
FINALLY, NO CLIPPING!!!
Killermankey Mar 3, 2024
c97566e
conveytors fixed???
Killermankey Mar 3, 2024
54d22c7
fixed the shit show?
Killermankey Mar 3, 2024
c4a6c7d
Incineration Capability
Killermankey Mar 3, 2024
84d3577
Stopping pipe virus + brig fixes
Killermankey Mar 3, 2024
4f1f895
The Pipe Virus must be stopped
Killermankey Mar 3, 2024
a3e1acf
A cure for pipe virus is found. Distributing it.
Killermankey Mar 3, 2024
233dab2
Eradication of the pipe virus will be a long fight
Killermankey Mar 3, 2024
8c4778e
Update SteelStation.dmm
Killermankey Mar 3, 2024
546b59a
final fix??? gone wrong?
Killermankey Mar 3, 2024
fd2a42f
yes batman, it did go wrong
Killermankey Mar 3, 2024
b7e0be5
Update SteelStation.dmm
Killermankey Mar 3, 2024
5cb3984
Lets just move it all to the side!
Killermankey Mar 3, 2024
fd72c88
fuck the filter
Killermankey Mar 3, 2024
75e0401
maybe omni pipes work?
Killermankey Mar 3, 2024
1b3cba6
something stupid
Killermankey Mar 3, 2024
2b2ca2e
Fuck it I surrender
Killermankey Mar 3, 2024
418c85f
the first of many after the first test run
Killermankey Mar 6, 2024
334cd91
not done yet
Killermankey Mar 6, 2024
9f8a4bf
batt gonna die
Killermankey Mar 6, 2024
25c3d3a
never gonna be done, but must keep going
Killermankey Mar 7, 2024
075bb50
Duty Free
Killermankey Mar 12, 2024
c73d077
No map diff failure?
Killermankey Mar 17, 2024
8cb7540
shite
Killermankey Mar 17, 2024
a4abf08
fixed now??? gone right?
Killermankey Mar 17, 2024
a644ccf
shutter was being biatch
Killermankey Mar 17, 2024
a687000
test twoua
Killermankey Mar 17, 2024
031d8d4
RAPIDO
Killermankey Mar 17, 2024
eda9e41
test 2 patch
Killermankey Mar 18, 2024
edb730e
fookin fat fingers
Killermankey Mar 18, 2024
e5048cd
Update SteelStation.dmm
Killermankey Mar 18, 2024
74cf4e0
Credit to "The Prophet" for improving engineering
Killermankey Mar 18, 2024
6bb458c
Cargo Camms Designated
Killermankey Mar 18, 2024
fa071b2
2nd Kitchen and Cargo has named Cams
Killermankey Mar 18, 2024
0f9dc0a
Engineering and Atmos cams named
michaelyoungin Mar 18, 2024
950fe51
Fixed ALL Ai blind spots
michaelyoungin Mar 18, 2024
ff6ae19
Added a few more cams and some consoles and decor to qm room
michaelyoungin Mar 18, 2024
6ebeb9e
Added a new area to designate the second SM
michaelyoungin Mar 18, 2024
9768970
Fixed a error
michaelyoungin Mar 18, 2024
02427ff
Command + Medbay & maintification
Killermankey Mar 18, 2024
3acefc7
Update SteelStation.dmm
Killermankey Mar 18, 2024
65cba53
Cryo fixed to add waste scrubber
michaelyoungin Mar 19, 2024
5fd6f32
Brig decorations, added donuts to sec
michaelyoungin Mar 19, 2024
3be68d4
Added new area for the second kitchen and gave chefs cqc in it
michaelyoungin Mar 19, 2024
924ad83
Makes Evac & Arrivals more airport Like
Killermankey Mar 19, 2024
3820f91
Fixed ALL issues above and also fixed station config file
michaelyoungin Mar 20, 2024
62e301b
revert to change made to arrivals
michaelyoungin Mar 20, 2024
900d56b
Added new conveyors that cannot be turned(subject to change)
michaelyoungin Mar 20, 2024
f0d7e00
Return of the Loading Ramps
Killermankey Mar 20, 2024
d37d4ac
Merge branch 'SteelStation' of https://github.com/Killermankey/McStea…
Killermankey Mar 20, 2024
6c52208
The airport now have aircraft
Killermankey Mar 20, 2024
76370d9
Realignments and fixes
Killermankey Mar 20, 2024
b78d249
Changes some flavor on new conveyors
michaelyoungin Mar 20, 2024
52f6cf5
2ndary bar and baggage services
Killermankey Mar 20, 2024
039a08d
Merge branch 'SteelStation' of https://github.com/Killermankey/McStea…
Killermankey Mar 20, 2024
f5469e5
dexee fixes
Killermankey Mar 20, 2024
55011cb
Ack
Killermankey Mar 21, 2024
a5c830c
Adds steel to the map pool, currently unvotable 50 player min
michaelyoungin Mar 21, 2024
781e679
Kitchen Access & pipe redundancy
Killermankey Mar 22, 2024
7a97dd1
Update SteelStation.dmm
Killermankey Mar 22, 2024
e9eed92
Merge branch 'SteelStation' of https://github.com/Killermankey/McStea…
michaelyoungin Mar 23, 2024
cd12d43
well you can get on board now
Killermankey Mar 23, 2024
6bb6ff0
Merge branch 'SteelStation' of https://github.com/Killermankey/McStea…
Killermankey Mar 23, 2024
8156749
Arrivals shuttle is now space shuttle
Killermankey Mar 23, 2024
726d3ab
fek
Killermankey Mar 24, 2024
fcecbad
Distinguished new areas/conveyors as monke edits
michaelyoungin Mar 24, 2024
7eaaf19
Merge branch 'SteelStation' of https://github.com/Killermankey/McStea…
michaelyoungin Mar 24, 2024
bd7f39e
Revert "Merge branch 'SteelStation' of https://github.com/Killermanke…
michaelyoungin Mar 24, 2024
8f1fb6f
pipes fixed
Killermankey Mar 24, 2024
c64a371
Merge branch 'Monkestation:master' into SteelStation
michaelyoungin Mar 24, 2024
e33c469
Minor Changes while in class
Killermankey Mar 25, 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
123,696 changes: 123,696 additions & 0 deletions _maps/map_files/SteelStation/SteelStation.dmm

Large diffs are not rendered by default.

556 changes: 556 additions & 0 deletions _maps/shuttles/arrival_steel.dmm

Large diffs are not rendered by default.

1,682 changes: 1,682 additions & 0 deletions _maps/shuttles/emergency_steel.dmm

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions _maps/steelstation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"version": 1,
"map_name": "SteelStation",
"map_path": "map_files/SteelStation",
"map_file": "SteelStation.dmm",
"shuttles": {
"cargo": "cargo_box",
"ferry": "ferry_fancy",
"whiteship": "whiteship_meta",
"emergency": "emergency_meta"
},
"job_changes": {
"Cook": {
"additional_cqc_areas": ["/area/station/service/auxkitchen"]
}
}
}
10 changes: 10 additions & 0 deletions code/datums/shuttles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,12 @@
credit_cost = CARGO_CRATE_VALUE * 4
description = "A train but in space, choo choo!"

/datum/map_template/shuttle/emergency/steel
suffix = "steel"
name = "Steel Station Emergency Shuttle"
credit_cost = CARGO_CRATE_VALUE * 12
description = "A space airliner designed for steel stations runways. This shuttle will not fit other stations and should be headed with caution."

/datum/map_template/shuttle/emergency/scrapheap
suffix = "scrapheap"
name = "Standby Evacuation Vessel \"Scrapheap Challenge\""
Expand Down Expand Up @@ -717,6 +723,10 @@
suffix = "kilo"
name = "arrival shuttle (Kilo)"

/datum/map_template/shuttle/arrival/steel
suffix = "steel"
name = "arrival shuttle (Steel)"

/datum/map_template/shuttle/arrival/pubby
suffix = "pubby"
name = "arrival shuttle (Pubby)"
Expand Down
14 changes: 14 additions & 0 deletions code/game/area/areas/station.dm
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,12 @@
icon_state = "kitchen_cold"
sound_environment = SOUND_AREA_SMALL_ENCLOSED

//Auxiliary Kitchen
//Monkestation edit for duplicate departments
/area/station/service/auxkitchen
name = "\improper Auxiliary Kitchen"
icon_state = "kitchen"

/area/station/service/kitchen/diner
name = "\improper Diner"
icon_state = "diner"
Expand Down Expand Up @@ -834,6 +840,14 @@
icon_state = "engine_sm_room"
sound_environment = SOUND_AREA_LARGE_ENCLOSED

//Steelstation Second Sm
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

modular

//Monkestation edit for duplicate departments
/area/station/engineering/supermatter/aux_sm
name = "Auxiliary Supermatter"

/area/station/engineering/supermatter/room/aux_sm
name = "Auxiliary Supermatter Engine"

/area/station/engineering/break_room
name = "\improper Engineering Foyer"
icon_state = "engine_break"
Expand Down
13 changes: 13 additions & 0 deletions code/modules/recycling/conveyor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
/obj/machinery/conveyor/centcom_auto
id = "round_end_belt"

/obj/machinery/conveyor/no_touch
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should also be modular

id = "non_adjustable_belt" //stop those monsters from moving these belts

/obj/machinery/conveyor/inverted //Directions inverted so you can use different corner pieces.
icon_state = "conveyor_map_inverted"
flipped = TRUE
Expand Down Expand Up @@ -253,6 +256,16 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
return
SSmove_manager.stop_looping(thing, SSconveyors)

// stuff for not messing with the not messable conveyors
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

modular

// Monkestation edit for Steelstation
/obj/machinery/conveyor/no_touch/attackby(obj/item/attacking_item, mob/living/user, params)
if(attacking_item.tool_behaviour == TOOL_CROWBAR)
to_chat(user, span_notice("The belt is stuck on too tight!"))
else if(attacking_item.tool_behaviour == TOOL_WRENCH)
to_chat(user, span_notice("You can't turn this belt!"))
else if(attacking_item.tool_behaviour == TOOL_SCREWDRIVER)
to_chat(user, span_notice("The belt cannot be reversed!"))

// attack with item, place item on conveyor
/obj/machinery/conveyor/attackby(obj/item/attacking_item, mob/living/user, params)
if(attacking_item.tool_behaviour == TOOL_CROWBAR)
Expand Down
4 changes: 4 additions & 0 deletions config/maps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ map northstar
votable
endmap

map SteelStation
minplayers 50
endmap


map runtimestation
endmap
Expand Down
Loading