Escape pods now no longer launch automatically during regular crew
transfers. However they can be set to launch during a regular crew
transfer by emagging the escape pod controller.
Also fixes emergency shuttle arrival announcement having the wrong ETD.
Conflicts:
code/controllers/emergency_shuttle_controller.dm
maps/tgstation2.dmm
Also fixes some bad grammar in the shuttle authorization announcements, and reduces the number of authorizations required to 2. 3 seemed a bit high.
Conflicts:
code/controllers/emergency_shuttle_controller.dm
Replaces the old emergency shuttle control console with a nice new
NanoUI one. Improves the NanoUI for the docking controllers.
Conflicts:
maps/tgstation2.dmm
Moves all ferry shuttle processing into one place: the new shuttle
controller.
Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.
Conflicts:
code/controllers/master_controller.dm
code/controllers/verbs.dm
code/game/supplyshuttle.dm
code/modules/shuttles/shuttle.dm
Added sprites for stationary drilling gear.
Added skeleton ores for coal, adamantine, mythril. Updated some icons. Expanded mining rig functionality.
Changed adamantine and mythril to osmium and metallic hydrogen.
Added ore distribution map generation to master controller.
Added upgrading to stationary drills, tweaked other stuff.
Rewriting the ore processor and how ores handle information. Also rewrote the ore stacker.
Conflicts:
baystation12.dme
code/controllers/master_controller.dm
code/modules/mining/coins.dm
code/modules/mining/machine_processing.dm
code/modules/mining/machine_stacking.dm
code/modules/mining/minerals.dm
code/modules/mining/satchel_ore_boxdm.dm
Squashes 3 commits:
Shuttles now dock on arrival and departure
Adds docking controller to outpost, tweaks
Finishes off shuttle_console
Could use some cleanup, though.
Commented out the debug stuff.
Conflicts:
code/controllers/master_controller.dm
code/game/machinery/embedded_controller/docking_program.dm
code/game/machinery/embedded_controller/simple_docking_controller.dm
code/modules/shuttles/shuttle.dm
maps/tgstation2.dmm
Option starts off by default, since that could be seen as the original behavior...
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Conflicts:
code/controllers/configuration.dm
config/example/config.txt
This was probably bound to happen either way the previous version was based upon a faulty understanding of how the areas worked this is much more robust and only messes with the master areas
and master areas needing power updates call power updates for the each of it's child areas. Also added where messing with SMESes called for an update on all areas power consumption, probably
not required but doing so either way.
We also rebuild the active_areas list every 5 minutes, if you get a engineer that wants to build a new area off of the station with APC's set rebuild_all_areas in the master controller and it will
update instantly, otherwise wait 5 minutes. The only downside to this 5 minutes is you might get free energy until that area becomes active.
Conflicts:
code/controllers/master_controller.dm
code/modules/power/apc.dm
Adds a config option MENTORS which sets the variable config.mods_are_mentors
Adds a rights level of R_MENTOR which gets msay, private message, aghost, notes, and a new proc for checking for new players (requires database support).
If the confic option for mentors is set then
the ckeys listed in moderators.txt file will instead be set as mentors, you can still make moderators by adding them in admins.txt
staffwho will show Mentors instead of Moderators as the heading above the listing of non-admins.
Also: Players now get a message gently reminding them to click the name of the staff member to reply instead of ahelping over and over.
Conflicts:
code/game/verbs/who.dm
code/modules/admin/admin_verbs.dm
code/modules/admin/verbs/deadsay.dm
config/example/config.txt
Adds a config option MENTORS which sets the variable config.mods_are_mentors
Adds a rights level of R_MENTOR which gets msay, private message, aghost, notes, and a new proc for checking for new players (requires database support).
If the confic option for mentors is set then
the ckeys listed in moderators.txt file will instead be set as mentors, you can still make moderators by adding them in admins.txt
staffwho will show Mentors instead of Moderators as the heading above the listing of non-admins.
Also: Players now get a message gently reminding them to click the name of the staff member to reply instead of ahelping over and over.
Conflicts:
code/controllers/configuration.dm
code/game/verbs/who.dm
code/modules/admin/admin_ranks.dm
config-example/config.txt
mwerezak