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