ZomgPonies
29700e8845
Rusted walls, oh yes.
2014-06-15 06:32:36 -04:00
ZomgPonies
63cd212008
Fixes the vending machine bug?
2014-06-15 01:41:54 -04:00
ZomgPonies
692e7ef435
Fixing biting your own hand off
2014-06-14 23:18:12 -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
f219643f96
Fixes #5195
2014-06-14 22:02:35 -04:00
Kelenius
7202d60633
Rune drawing update
2014-06-14 21:52:41 -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
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
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
Regen
7263fc5eef
More PR fixes I guess
2014-06-14 22:46:05 +02:00
ZomgPonies
8d8d213e3e
Merge pull request #253 from GhostAA12/master
...
Fixes the Rapid Parts Exchange device
2014-06-14 16:00:45 -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
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
mwerezak
64edd31d67
Generalizes embedded program
...
Conflicts:
code/game/machinery/embedded_controller/embedded_controller_base.dm
2014-06-14 03:51:17 -04:00
mwerezak
ca65e48cdf
Implemented docking commands
...
Squashed 4 commits.
2014-06-14 02:58:22 -04:00
mwerezak
5fae1db085
Initial commit
...
Conflicts:
code/game/machinery/embedded_controller/airlock_program.dm
2014-06-14 02:58:00 -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
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
Regen
96c15156c8
Changeling deathgasp fix
...
Now it will look like you actually died from regenerative stasis
2014-06-13 14:33:26 +02:00
AlexanderSeto
57e8d921ff
Recommits storage
2014-06-12 16:28:19 -07:00
ZomgPonies
fb5265d1b1
You forgot 2 commas, NOW I'm annoyed :D
2014-06-09 01:23:12 -04:00
ZomgPonies
d1f2f9c361
Merge pull request #246 from BobTheBoss64/master
...
Added volume to Zippo lighters.
2014-06-09 01:09:24 -04:00
Michael Slettevold
0a1b0af8f7
Fixed lack of Zippo volume
2014-06-08 20:20:56 -07:00
Michael Slettevold
47ec7fc3f1
Fixed lack of Zippo volume
2014-06-08 20:19:33 -07:00
Michael Slettevold
a30cd63810
Added sound effect for opening and closing Zippo lighters.
...
Corrected spelling of "independent", for flagprocs.dm.
2014-06-08 20:14:33 -07:00
ZomgPonies
32e0776b2d
Merge pull request #245 from BobTheBoss64/master
...
Zippo sound effects and spelling fixes
2014-06-08 21:56:17 -04:00
Erthilo
ee56d75f52
Bandage Typos.
2014-06-08 17:38:06 -04:00
Erthilo
1d539848fa
Prevents diona nymph spam.
...
Conflicts:
code/game/machinery/podmen.dm
2014-06-08 17:30:07 -04:00
nyanpasu
4aad7c1738
Modified power monitor to output to a formatted table.
...
Conflicts:
code/game/machinery/computer/power.dm
2014-06-08 17:27:28 -04:00
Michael Slettevold
57eed9777c
Added sound effect for opening and closing Zippo lighters.
...
Corrected spelling of "independent", for flagprocs.dm.
2014-06-08 14:17:37 -07:00
d3athrow
a271304044
Fix a runtime that occurs from closing the Clothing menu on a human.
2014-06-08 16:24:21 -04:00
ZomgPonies
8ad505e18c
Added abandoned drug lab to map.
2014-06-06 16:00:53 -04:00
ZomgPonies
0d57c3ef4d
Tune bag choking
2014-06-06 00:06:17 -04:00
ZomgPonies
4683a12a35
Fix for storage bags
2014-06-05 22:17:01 -04:00
ZomgPonies
caaf56dbcc
Bugfix for bag choking
2014-06-05 17:09:27 -04:00
Rob Nelson
0762e137ab
Fix safe...?
...
Conflicts:
code/game/objects/objs.dm
2014-06-05 16:21:26 -04:00
Rob Nelson
5649e2c34d
Optimize the fuck out of using checks in machines.
2014-06-05 16:16:27 -04:00
Jeremy Liberman
b9f40d1b71
Rephrase text based on code review
2014-06-05 16:05:25 -04:00
Jeremy Liberman
33cd27e032
Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel.
...
Conflicts:
code/__HELPERS/names.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/mob.dm
code/modules/mob/new_player/new_player.dm
2014-06-05 16:05:09 -04:00
ZomgPonies
b9fe3ab514
Added choking people with plastic bags.
2014-06-05 04:43:30 -04:00
Zuhayr
4f37a924fe
Replaces the derelict, modifies the DJ station, adds a shuttle bay to Engineering.
...
Conflicts:
baystation12.dme
maps/tgstation2.dmm
2014-06-04 15:30:09 -04:00
Fira
df5293770d
Added GhostRadio -- Allowing ghosts to spy on radio from anywhere
...
Conflicts:
code/modules/client/preferences.dm
code/modules/client/preferences_toggles.dm
code/setup.dm
2014-06-04 01:48:53 -04:00
