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

Airlock controller rewrite #4408

Merged
merged 3 commits into from
Feb 13, 2014
Merged

Airlock controller rewrite #4408

merged 3 commits into from
Feb 13, 2014

Conversation

ElArGee
Copy link
Contributor

@ElArGee ElArGee commented Feb 10, 2014

Rewrote the airlock controller. It is now more versatile and has NanoUI.

More details in the commits.

Minor issue: air supply pipes are invisible in dream maker until you compile. They are still in the map, just not rendered. Not sure if this is an issue for anyone else.

@Iamgoofball
Copy link
Contributor

imgz plz

@ElArGee
Copy link
Contributor Author

ElArGee commented Feb 10, 2014

Airlock controller:

Should there be any safeguards on the "force door" buttons? Right now on the current controller you can force the doors while the airlock isn't cycling and both doors are closed. You can open both doors in one go if you want.

Door controller:
door_control

Should the door controller have "force" buttons available?
Also the secure button lets you toggle whether the doors will be bolted on the next cycle or not. I'm not sure whether this should be available on not. Both are easy changes though.
I could potentially add an advanced version with force doors and the secure toggle.

Advanced airlock controller:
adv_airlock_control

The advanced controller isn't used on the station anywhere yet, but I plan to use it in my engineering remap.
The idea behind it is to have a "passive" airlock that allows access as per normal, but when you enable "secure" it drops the door bolts and functions like an airlock. It also will adjust the chamber pressure to the target environment pressure. The purge button forces the room to decompress before cycling.

@Ccomp5950
Copy link
Contributor

Cannot be automatically merged, map is conflicting.

Tried merging from the command line using mapmerge driver and still no go.

@ElArGee
Copy link
Contributor Author

ElArGee commented Feb 12, 2014

Thought that might happen. I'll fix the map.

- Fixed DP vent pumps not changing direction
- Made airlock_sensor more versatile (and backwards compatible with old airlock code)
- Added airlock_sensor and access_button airlock subtypes for easier mapping
- /datum/computer/file/embedded_program moved from embedded_controller_base.dm to code/game/machinery/embedded_controller/airlock_program.dm
- embedded_controller_base.dm cleaned up and identical parts of the controller subtypes were moved here
- embedded_controller subtypes moved to code/game/machinery/embedded_controller/airlock_controllers.dm
- Added nanoUI templates for airlock controllers
- Added a couple of classes to nano/css/shared.css for colouring buttons
- Minor map update to maintain airlock compatibility and fix a broken airlock near virology
- Should now merge
@ElArGee
Copy link
Contributor Author

ElArGee commented Feb 13, 2014

Rebased and re applied the changes - this should now merge quite happily.

@MistakeNot4892
Copy link
Contributor

Is this alright for a merge, Ccomp?

Ccomp5950 added a commit that referenced this pull request Feb 13, 2014
@Ccomp5950 Ccomp5950 merged commit c653c37 into Baystation12:dev Feb 13, 2014
@ElArGee ElArGee deleted the airlock-merge branch February 13, 2014 21:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants