ZomgPonies
85b8878cbe
Made riot helmets and captains space helmet protect against facehuggers
2014-06-15 06:26:41 -04:00
ZomgPonies
d9960d487c
Hurrr
2014-06-15 03:58:50 -04:00
ZomgPonies
a211cca4dc
Cart fixes
2014-06-15 03:58:19 -04:00
ZomgPonies
c505c0690c
Fixes janicart/segway
2014-06-15 02:39:14 -04:00
ZomgPonies
a21ccf0139
Add the other shuttle controllers back in
2014-06-15 01:54:38 -04:00
ZomgPonies
692e7ef435
Fixing biting your own hand off
2014-06-14 23:18:12 -04:00
Loganbacca
80d616e624
Cargo train bugfixes
...
Also adds admin messaging when someone gets run over.
2014-06-14 22:15:31 -04:00
Loganbacca
083cd19c6a
New vehicle framework
...
- Implements a new vehicle framework
- Adds cargo trains
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2014-06-14 22:14:53 -04:00
Zuhayr
46f1261573
Amending a runtime in the mmi change.
...
Conflicts:
code/modules/mob/transform_procs.dm
2014-06-14 22:05:11 -04:00
Zuhayr
fbac64ddfe
Fixes #5245
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2014-06-14 21:56:52 -04:00
Zuhayr
613e0881cf
Fixes #5243
...
Conflicts:
code/modules/mob/transform_procs.dm
2014-06-14 21:54:52 -04:00
Zuhayr
4fb5a08235
Fixes #5246
2014-06-14 21:53:13 -04:00
ZomgPonies
9f9b2b5ae2
Commenting out the other docking controllers until I get science setup correctly.
2014-06-14 21:38:27 -04:00
mwerezak
e0d3e7e4d7
Adds docking control to ERT shuttle
...
Also adjusts the location of the centcom shuttle docking controller.
Conflicts:
code/modules/shuttles/shuttle.dm
maps/tgstation2.dmm
2014-06-14 21:33:05 -04:00
mwerezak
aa39abacec
Adds centcom and admin shuttle docking controllers
...
Conflicts:
maps/tgstation2.dmm
2014-06-14 21:29:47 -04:00
mwerezak
3dbb1fe6c9
Adds engineering shuttle docking controllers
...
Also fixed bad req_access_txt. Was accidentally using req_access_txt
instead of req_one_access_txt. Fixed virology maint not having any
access codes set.
Conflicts:
maps/tgstation2.dmm
2014-06-14 21:29:25 -04:00
mwerezak
f22c9db34d
Streamlined docking code
...
Server and client now have more consistent responsibilities.
Ferry shuttles will always be forced undocked when moved, even if moved
by admin magic.
Conflicts:
code/game/machinery/embedded_controller/docking_program.dm
2014-06-14 21:29:02 -04:00
mwerezak
15641bc88a
Adds mining shuttle docking controllers
...
Conflicts:
maps/tgstation2.dmm
2014-06-14 21:25:18 -04:00
mwerezak
cdabebba3e
Adjusts how undocking signals are used
...
Now both server and client will to undock concurrently. It looks much
more natural.
Conflicts:
code/game/machinery/embedded_controller/docking_program.dm
code/game/machinery/embedded_controller/simple_docking_controller.dm
2014-06-14 21:23:59 -04:00
mwerezak
cd540fe56d
Shuttle console refactoring
...
Also adjusted the way undocking signals were used.
Conflicts:
code/game/machinery/doors/airlock_control.dm
code/game/machinery/embedded_controller/docking_program.dm
code/modules/shuttles/shuttle.dm
2014-06-14 21:22:30 -04:00
mwerezak
fbd4c870eb
Docking overrides now have a clear purpose
...
Originally the purpose of the docking override was to allow the shuttle
to move even if it couldn't undock properly (e.g. the doors were stuck
open), however it makes more sense just to have the shuttle take care of
that. This commit now makes the behaviour of the docking overrides line
up with it's new purpose.
Conflicts:
code/game/machinery/embedded_controller/docking_program.dm
2014-06-14 21:19:53 -04:00
Nerezza
ad2c9a2550
Make drone light into verb
...
Removes the penlight and builds a low power LED into the chassis.
Already tested to work locally, won't ghost a light.
Conflicts:
code/modules/mob/living/silicon/robot/robot_modules.dm
2014-06-14 21:16:08 -04:00
ZomgPonies
8d8d213e3e
Merge pull request #253 from GhostAA12/master
...
Fixes the Rapid Parts Exchange device
2014-06-14 16:00:45 -04:00
ZomgPonies
6a8f016abc
Runtime fix
2014-06-14 15:55:05 -04:00
GhostAA12
81c000f0cf
Fixes the Rapid Parts Exchange device
...
Previously did nothing because of missing proc on machinery
2014-06-14 11:41:18 -07: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
mwerezak
629c14a66c
Adds support for different shuttle states
...
Also cleans up shuttle move states a bit.
Moves shuttle_console to it's own file
Conflicts:
code/modules/shuttles/shuttle.dm
2014-06-14 04:04:36 -04:00
mwerezak
1f90fe05c8
Adds docking controllers to shuttles
...
Shuttles dock at round start.
Conflicts:
code/modules/shuttles/shuttle.dm
maps/tgstation2.dmm
2014-06-14 03:58:51 -04:00
Zuhayr
ed380b1dad
Moved the supply shuttle arrival/departure over to the shuttle datum. Needs testing, probably going to break.
2014-06-14 02:34:44 -04:00
Zuhayr
361503fa8b
Converted Syndicate shuttle over to multi-shuttle setup.
...
Conflicts:
baystation12.dme
code/game/gamemodes/nuclear/pinpointer.dm
2014-06-14 02:25:15 -04:00
Zuhayr
4385b1320c
Moved the Vox skipjack console over to a multi-destination shuttle datum setup.
...
Conflicts:
baystation12.dme
code/game/gamemodes/vox/heist/heist.dm
code/game/machinery/computer/vox_shuttle.dm
2014-06-14 02:22:11 -04:00
Zuhayr
e6a8680347
Update shuttle.dm
...
Corrected a mistake.
2014-06-14 02:11:05 -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
Zuhayr
689110af1d
Some cleanup stuff for prior commits.
2014-06-14 02:01:58 -04:00
Zuhayr
e4b95aa05e
Moved engineering, research and mining shuttles to a generalized system with its own directory structure.
...
Conflicts:
baystation12.dme
code/modules/mining/mine_items.dm
code/modules/research/research_shuttle.dm
2014-06-14 02:01:14 -04:00
ZomgPonies
386b1b8307
Fixes a bunch more hurt -> harm checks
2014-06-14 01:02:29 -04:00
AlexanderSeto
57e8d921ff
Recommits storage
2014-06-12 16:28:19 -07:00
Necaladun
22f4f9004f
Donator fluff item
...
Flagbearer's rebel outfit.
2014-06-11 15:52:01 +09:30
ZomgPonies
580c19e038
Machine people have no internal organs
2014-06-10 03:32:34 -04:00
ZomgPonies
e9dbeeab7e
Preferences fixes
2014-06-10 03:32:14 -04:00
ZomgPonies
1425001472
Bleh addiction
2014-06-09 19:01:10 -04:00
d3athrow
7fc8fdea05
Fix grabbing aliens grabbing yourself.
...
They were not updated to the new grab refactor when click code rework was ported.
2014-06-09 18:34:23 -04:00
ZomgPonies
23f2885c01
Moar addiction fixuns
2014-06-09 01:54:03 -04:00
ZomgPonies
ff5ac9b8a3
Moar addiction fixuns
2014-06-09 01:08:30 -04:00
ZomgPonies
0e7ad2e4d5
Addictiveness fix
2014-06-08 23:00:57 -04:00
ZomgPonies
2c709df1da
Bugfixins
2014-06-08 22:04:16 -04:00
ZomgPonies
2c57ec96ae
First commit of the addiction system
2014-06-08 21:55:03 -04:00
SparklySheep
96fbad479c
Removes Impedrezene from the Paralysis Pen
...
Because random brain damage from a pen is terrible, especially if you're trying to extract information from the person.
2014-06-08 18:30:56 -04:00
