mwerezak
4713c31546
Fixes shuttles getting stuck when cancelling launch
2014-06-28 19:40:39 -04:00
mwerezak
1cc840dccc
Adds the ability to force launch escape pods
...
Also reduces their countdown from 15 to 10 seconds.
2014-06-28 19:40:18 -04:00
Chinsky
42a3a27329
Merge pull request #5384 from Jarcolr/custom_item
...
Updates a custom item sprite and adds 2 approved custom items
2014-06-28 17:00:56 +04:00
Jarcolr
be74be4c95
Fixes the jackboots
2014-06-28 14:11:58 +03:00
Zuhayr
44d6bc199a
Merge pull request #5379 from PsiOmegaDelta/AIStun
...
AI now handles the sunned status like other creatures do in their life.dm file
2014-06-28 19:43:27 +09:30
Jarcolr
5de1f11e8d
Updates a item sprite and adds 2 approved items
...
http://baystation12.net/forums/viewtopic.php?f=33&t=10693
http://baystation12.net/forums/viewtopic.php?f=33&t=10678
Paths to new files are:
/obj/item/weapon/lighter/zippo/fluff/isaac_jachym
/obj/item/clothing/shoes/jackboots/fluff/kecer_eldraran
2014-06-28 11:33:49 +03:00
PsiOmega
972bbac033
AI now handles EMP-stun like other creatures do in their life.dm file
...
Previously AI would be stunned indefinitely after being hit with an EMP-blast. This would prevent emergency shutters from being operated.
The stun status is now adjusted down in the Life()-proc like is done in the base living.dm, which the AI living.dm does not ..() call.
2014-06-27 21:24:01 +02:00
Chinsky
6bd0743aa3
Merge pull request #5367 from Zuhayr/voxwhitelist
...
Adds Vox as a station race, adds vox clothing icons from /vg/.
2014-06-27 19:36:31 +04:00
Zuhayr
274a7a844a
Merge pull request #5372 from mwerezak/emergency-shuttle
...
More shuttle updates
2014-06-27 18:36:37 +09:30
mwerezak
363df869e2
Improves the fix for shuttles being stuck if...
...
... the docking controller is destroyed.
2014-06-26 19:01:17 -04:00
mwerezak
deb1e1007c
Fixes ERT shuttle not announcing a cancelled...
...
...launch if the launch is cancelled after the countdown is completed.
2014-06-26 17:21:45 -04:00
Chinsky
ae16c5e673
Merge pull request #5368 from Zuhayr/dev
...
Uncommented gateway spawn point.
2014-06-27 01:13:28 +04:00
mwerezak
84023ff1a3
Updates secrets panel to use the new shuttle...
...
...datum correctly.
2014-06-26 14:48:49 -04:00
mwerezak
93c13a06d5
Fixes base shuttle console requiring engine access
2014-06-26 14:48:29 -04:00
mwerezak
363ef79301
Fixes shuttles getting stuck if the docking...
...
...controller they are trying to dock with has been destroyed or is not
responding.
2014-06-26 13:58:56 -04:00
Zuhayr
2ee8f78f75
More icon changes, updates item paths, moves vox cortical stack spawn to raider proc, makes vox whitelisted and spawnable with internals.
2014-06-26 08:47:58 +09:30
mwerezak
e80f42cad4
Merge remote-tracking branch 'upstream/dev' into emergency-shuttle
...
Conflicts:
code/setup.dm
2014-06-25 13:28:18 -04:00
mwerezak
ea1060ac33
Fixes shuttle consoles not checking access
...
Generalizes machine access.
2014-06-25 13:20:12 -04:00
mwerezak
d5c5d4b21f
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.
2014-06-25 12:32:12 -04:00
Zuhayr
6e0b261653
Uncommented gateway spawn point.
2014-06-25 22:52:55 +09:30
Chinsky
335880062d
Merge pull request #5357 from Zuhayr/dev
...
Mining tweaks, removal of debug/cruft, balancing of values.
2014-06-25 16:05:32 +04:00
Chinsky
cc9cf46dbe
Merge pull request #5359 from Baystation12/master
...
master -> dev
2014-06-25 15:37:04 +04:00
Zuhayr
30bf9302d6
Update cat.dm
2014-06-25 19:57:15 +09:30
Zuhayr
808ca3aea4
Merge pull request #5355 from comma/holder
...
Moved scooping into a separate helper.
2014-06-25 19:55:24 +09:30
Zuhayr
9638349fe2
Update distribution.dm
2014-06-25 16:48:20 +09:30
Zuhayr
89a450c4f4
Mining tweaks, removal of debug/cruft, balancing of values.
2014-06-25 16:25:15 +09:30
Zuhayr
3ab7e510d5
Removed reference to :b in drone spawn text.
2014-06-25 14:34:28 +09:30
mwerezak
fccc16f8b8
Fix for long_jumps never leaving transition area
...
The previous behaviour of move() called without arguments assumed a
short_jump, which meant that the wrong origin area would be used.
2014-06-25 00:21:27 -04:00
mwerezak
05ced4b89d
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.
2014-06-25 00:18:56 -04:00
mwerezak
abcba2c725
Merge remote-tracking branch 'upstream/dev' into emergency-shuttle
2014-06-24 17:49:20 -04:00
Zuhayr
5c002d3701
Changed cryo message a bit.
2014-06-24 21:18:47 +09:30
Zuhayr
4e673d047e
Merge branch 'spawnpoints' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-24 19:22:18 +09:30
Chinsky
481f3caec5
Moved scooping into a separate helper.
2014-06-24 13:46:15 +04:00
Chinsky
4da1a5302e
Merge pull request #5354 from Zuhayr/cattes
...
Made cats pickupable.
2014-06-24 13:12:01 +04:00
Chinsky
8c67326576
Merge pull request #5331 from UristMcKerman/pipeturbine
...
Pipe Turbine
2014-06-24 13:08:11 +04:00
Zuhayr
b67bb6470d
Made cats pick-up-able.
2014-06-24 14:41:08 +09:30
Zuhayr
24730cfd9f
Drones now have plasma cutters instead of emags.
2014-06-24 14:11:08 +09:30
Zuhayr
2262661549
Ravensdale thinks the gateway has lore problems, commenting it out of spawn.
2014-06-24 14:03:11 +09:30
Zuhayr
abc07e435c
Minor formatting fix.
2014-06-24 13:41:59 +09:30
mwerezak
25bcdfa39e
Merge remote-tracking branch 'upstream/dev' into emergency-shuttle
...
Conflicts:
code/setup.dm
2014-06-24 00:09:17 -04:00
Zuhayr
96bbe1d9db
Added spawnpoint datum, moved existing latejoin spawn to datum setup.
2014-06-24 13:33:48 +09:30
mwerezak
d892099ea3
Adds direction arg for area/move_contents_to()
...
Attempts to fix shuttle corner transition effect
Fixes bad ETAs appearing on status displays
2014-06-23 23:51:47 -04:00
mwerezak
ebacf05acf
Fixes escape shuttle not transitioning
2014-06-23 23:50:49 -04:00
Zuhayr
b63708577b
Merge pull request #5345 from comma/monkey_revenge
...
Monkey cube now expand when eaten, leading to !!FUN!!
2014-06-24 11:41:33 +09:30
Zuhayr
4cc0d6b6ee
Fixes #5339
2014-06-24 11:35:08 +09:30
mwerezak
e17b8bffab
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.
2014-06-23 22:01:21 -04:00
mwerezak
9e0562b16c
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.
2014-06-23 22:00:57 -04:00
Zuhayr
e27cdb3620
Fixes #5323
2014-06-24 11:24:19 +09:30
Zuhayr
ef277f1e6b
Added extra bit of info to drone spawn.
2014-06-24 11:24:11 +09:30
Zuhayr
14bf0f064c
Removed ability for drones to talk on Binary.
2014-06-24 11:23:59 +09:30
