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
GinjaNinja32
0fc144ed35
Fix xenoarcheology field generator
2014-06-08 18:30:37 -04:00
ZomgPonies
e3d2a1716d
Fix syndi helmets thanks PPI
2014-06-08 18:18:14 -04:00
Erthilo
26a4b0a816
Missed some files.
...
Conflicts:
icons/mob/species/vox/gloves.dmi
icons/mob/species/vox/suit.dmi
2014-06-08 18:14:12 -04:00
Erthilo
dfce6736fb
Tons more vox clothes.
...
Conflicts:
code/modules/clothing/gloves/miscellaneous.dm
code/modules/clothing/masks/breath.dm
code/modules/clothing/shoes/magboots.dm
code/modules/clothing/shoes/miscellaneous.dm
code/modules/clothing/suits/labcoat.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/carbon/species.dm
icons/mob/mask.dmi
icons/mob/species/vox/masks.dmi
icons/mob/species/vox/shoes.dmi
icons/mob/species/vox/uniform.dmi
2014-06-08 18:13:22 -04:00
Erthilo
d3eeb7945d
Hotfix for Zombie Powder not ever clearing Fakedeath.
2014-06-08 16:24:48 -04:00
Aranclanos
23387777c2
Ian will stop making the MC wait for his movements
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/corgi.dm
2014-06-08 16:23:17 -04:00
ZomgPonies
4cfeada9d7
Added baggies for drugs, aww yeah
2014-06-06 04:16:39 -04:00
ZomgPonies
b23b5b62d9
Made hyperzine same color as salt, because HAHA
2014-06-06 02:43:38 -04:00
ZomgPonies
489cdf0096
Made hyperzine harder to make properly.
2014-06-06 02:35:10 -04:00
ZomgPonies
f370d92dfa
Boop
2014-06-06 00:45:10 -04:00
ZomgPonies
710f44bc55
Fix borg stunbatons
2014-06-06 00:06:28 -04:00
Zuhayr
dc344d3d51
Update drone.dm
...
Typo fix and message trim fix.
2014-06-05 22:19:55 -04:00
ZomgPonies
751c3badd1
Added powerarmor to RnD
2014-06-05 22:09:32 -04:00
Hubblenaut
784461540e
Fixes setting internals on belt- and suit storage slots being ignored
2014-06-05 16:10:33 -04:00
Hubblenaut
31ca257cd2
Fixed an issue with IBs being almost twice as bad
...
Conflicts:
code/modules/organs/organ_external.dm
2014-06-05 16:10:17 -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
b139547aa3
Made it easier for diona nymphs to grow.
2014-06-04 23:06:58 -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
Hubblenaut
b5b5ce98ba
Movement with wheelchair not possible in space
2014-06-04 13:26:50 -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
ZomgPonies
958a4064de
Bleh
2014-06-03 23:55:19 -04:00
ZomgPonies
4b8f0020d6
Trying to fix people not hearing radio?
2014-06-03 22:52:12 -04:00
mwerezak
0ed8ee9b19
Readds flashes to all robots except drones.
...
Drones also get a special low-power flashlight, now.
2014-06-03 19:22:47 -04:00
mwerezak
e9dbed994c
Adds drone cameras to engineering network
2014-06-03 19:22:27 -04:00
mwerezak
44d2ba10fa
Fixes all robot_modules having access to flashes
...
Conflicts:
code/modules/mob/living/silicon/robot/robot_modules.dm
2014-06-03 19:21:53 -04:00
