Commit Graph

477 Commits

Author SHA1 Message Date
mwerezak
d3c35251bb Fixes macro escape slashes
Derp.

Conflicts:
	code/controllers/shuttle_controller.dm
2014-06-26 21:20:33 -04:00
mwerezak
9079bb353e Improves the fix for shuttles being stuck if...
... the docking controller is destroyed.
2014-06-26 21:19:13 -04:00
ZomgPonies
7ab91efdff ERT shuttle fix 2014-06-26 18:44:45 -04:00
mwerezak
ebe81e4cfb Improves shuttle ETA calculation 2014-06-26 16:52:59 -04:00
ZomgPonies
02395a5273 Missing debug controller 2014-06-26 15:09:16 -04:00
mwerezak
be27a08c3a Adds escape pod docking controllers
Conflicts:
	maps/tgstation2.dmm
2014-06-26 07:40:36 -04:00
mwerezak
59fd7a1f18 Adds escape pod docking controller type
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
2014-06-26 07:40:15 -04:00
mwerezak
02cc93392f Adds escape shuttle docking controllers
Conflicts:
	maps/tgstation2.dmm
2014-06-26 07:35:12 -04:00
mwerezak
ef0e9c50e9 Fixes missing announcements, bad returned() check
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
2014-06-26 07:14:40 -04:00
mwerezak
1845749c1a Fixes #5351
Multi-shuttle origin was being assigned a path, not an actual area.
2014-06-26 07:12:13 -04:00
ZomgPonies
e58f5eda41 Derpderp 2014-06-24 21:18:19 -04:00
ZomgPonies
0e8bb2a6b4 Hotfix for rounds not ending 2014-06-24 21:16:18 -04:00
mwerezak
eb86081165 Adds direction arg for area/move_contents_to()
Attempts to fix shuttle corner transition effect
Fixes bad ETAs appearing on status displays

Conflicts:
	code/modules/shuttles/shuttle.dm
	code/setup.dm
2014-06-24 07:26:03 -04:00
mwerezak
bd339f6156 Replaces the emergency shuttle control console
Replaces the old emergency shuttle control console with a nice new
NanoUI one. Improves the NanoUI for the docking controllers.

Conflicts:
	maps/tgstation2.dmm
2014-06-24 07:10:28 -04:00
mwerezak
e6944b989c Adds shuttle controller
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
2014-06-24 07:06:48 -04:00
mwerezak
7e057e7eb9 Minor shuttle fixes and cleanup
Readds the missing "shuttle has left the station" message, improves the
ETA calculation and reorganizes the procs in shuttle_controller.dm
2014-06-23 11:10:28 -04:00
mwerezak
d8c02c7b6e Some fixes
Conflicts:
	code/game/supplyshuttle.dm
2014-06-23 11:09:14 -04:00
mwerezak
59f1cc3b0a Forgot to process shuttles 2014-06-23 11:08:31 -04:00
mwerezak
8a873b4a1c Adds escape pods to the controller 2014-06-23 11:08:15 -04:00
mwerezak
9874ce38ce shuttle_controller now uses a shuttle datum
Conflicts:
	code/game/machinery/computer/communications.dm
	code/modules/admin/verbs/randomverbs.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/power/singularity/singularity.dm
2014-06-23 11:07:58 -04:00
Chinsky
eef382e821 Fix for a runtime. 2014-06-22 17:04:04 -04:00
Chinsky
e14c19f457 Changed color mixing to use weighted average instead of addition. Should help against values reaching FF too fast.
Adjusted color mixing helper to use inbuilt procs.
2014-06-20 12:08:30 -04:00
Chinsky
91e2bcda9c Made lights look fancier with blend modes
Conflicts:
	icons/effects/effects.dmi
2014-06-20 12:00:16 -04:00
Chinsky
4fe111bcdc Got vgstation13 colored lights rewrite working here.
Conflicts:
	code/__HELPERS/game.dm
	code/__HELPERS/logging.dm
	code/controllers/_DynamicAreaLighting_TG.dm
	icons/effects/effects.dmi
2014-06-20 11:59:38 -04:00
mwerezak
723979115c Renames supply controller global var
Renamed from 'supply_shuttle' to 'supply_controller'

Conflicts:
	code/controllers/verbs.dm
	code/game/gamemodes/gameticker.dm
	code/game/supplyshuttle.dm
2014-06-19 09:52:35 -04:00
ZomgPonies
e3ed1c3781 Removed a lot of the useless testing and error logging from the runtime log. 2014-06-16 23:01:41 -04:00
Zuhayr
ef59deb928 First pass on ore distribution map and stationary drilling rig.
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
2014-06-15 07:35:17 -04:00
mwerezak
cc287d00db Shuttles now dock on arrival and departure
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
2014-06-14 04:17:37 -04:00
mwerezak
a54ef207a1 Reworks shuttles to be more extensible
Kudos to Zuhayr for laying the groundwork for this.

Conflicts:
	code/controllers/master_controller.dm
	code/modules/shuttles/shuttle.dm
2014-06-14 04:13:34 -04:00
mwerezak
e9171a9ae3 Adds docking support to shuttles, NanoUI
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/airlock_control.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/modules/shuttles/shuttle.dm
	nano/css/shared.css
2014-06-14 04:10:39 -04:00
Zuhayr
7c442ac9a3 Added a 'controller' for shuttles (really just a data container), fixed up the admin shuttle verbs into one general verb, changed shuttles to use controller instead of populating lists at spawn.
Conflicts:
	code/controllers/master_controller.dm
	code/modules/admin/admin.dm
2014-06-14 02:10:10 -04:00
Mloc-Argent
b5f3379a0f Fixes runtime logging and makes it a config option.
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
2014-06-02 02:43:43 +02:00
ZomgPonies
5f67943f8e Revert "APC bugfix after someone messed with mah areas!"
This reverts commit ceca0ddbe8.
2014-05-27 21:22:53 -04:00
ZomgPonies
06bbfcf150 Final Nations patch before live testing. This is going to be painful. 2014-05-27 20:09:10 -04:00
Ccomp5950
ceca0ddbe8 APC bugfix after someone messed with mah areas!
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
2014-05-27 00:28:31 -04:00
ZomgPonies
3c9dbcc822 First commit for nations gamemode, setting up the framework I'll be using. 2014-05-26 20:02:20 -04:00
mwerezak
4299c2b174 Attempts to fix shuttle not being recallable 2014-05-24 22:08:02 +02:00
ZomgPonies
fac32af2f1 First commit of liquid simulation stuff 2014-05-23 14:31:29 -04:00
Jeremy Liberman
bd249e3a53 Mutiny Mode
Conflicts:
	code/__HELPERS/time.dm
	code/controllers/hooks-defs.dm
	code/controllers/hooks.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/podmen.dm
	code/modules/admin/player_panel.dm
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
	code/modules/security levels/keycard authentication.dm
	code/setup.dm
	icons/mob/mob.dmi
2014-05-15 01:01:54 -04:00
Zuhayr
d606d774d8 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.
Conflicts:
	baystation12.dme
	code/controllers/configuration.dm
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/examine.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/recycling/disposal.dm
	icons/mob/robots.dmi
	icons/obj/device.dmi
2014-05-12 01:41:02 -04:00
Ccomp5950
db072d7f4a Adds Mentors.
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
2014-05-06 01:18:36 -04:00
Razharas
95b6406adb Makes this shit actually work
Yeah, also added crafting controller to debug controllers(who will need
to debug crafting, but whatever)

Conflicts:
	code/controllers/verbs.dm
2014-05-04 22:55:42 -04:00
Ccomp5950
970525d065 Adds Mentors.
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
2014-05-04 21:37:37 -04:00
ESwordTheCat
2382984c03 Some optimization at object pooling, tinkering at beams.dm and reverting useless code.
Conflicts:
	code/modules/projectiles/projectile/beams.dm
2014-04-29 13:39:20 -04:00
ESwordTheCat
012b45ad32 Limit the pool only to 20 objects. 2014-04-29 13:33:25 -04:00
ESwordTheCat
44ee513752 Because it use less instructions. 2014-04-20 03:27:17 -04:00
ESwordTheCat
b332bc7dec Don't use get_area proc, introduce myArea variable.
Conflicts:
	code/modules/power/power.dm
2014-04-20 03:26:59 -04:00
ESwordTheCat
860aa21db0 Forgot continue on process pipenets. 2014-04-19 19:08:08 -04:00
ESwordTheCat
c5eec28a69 Process diseases optimized loop. 2014-04-19 19:07:58 -04:00
ESwordTheCat
6f89369486 Process pipenets optimized loop. 2014-04-19 19:06:30 -04:00