Zuhayr
3af608b629
Fixed a couple of oversights with cards.
2014-06-29 09:43:34 +09:30
Zuhayr
c7e9e1aa2a
Fixed It won't budge! from crates, added drag and drop for table climbing, added Adajcent check to table climbing.
2014-06-29 09:40:37 +09:30
Zuhayr
cf1abf65d9
Added better checks to leap(), prevented leap spamming (hopefully).
2014-06-29 09:20:04 +09:30
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
Chinsky
34137c5550
Merge pull request #5362 from Loganbacca/atmoso
...
Atmos Overhaul - Phase 1
2014-06-27 19:31:50 +04:00
Zuhayr
274a7a844a
Merge pull request #5372 from mwerezak/emergency-shuttle
...
More shuttle updates
2014-06-27 18:36:37 +09:30
mwerezak
7ae03d127b
Fixes macro escape slashes
...
Derp.
2014-06-26 20:48:07 -04:00
mwerezak
363df869e2
Improves the fix for shuttles being stuck if...
...
... the docking controller is destroyed.
2014-06-26 19:01:17 -04:00
Loganbacca
3aee224d12
Merge remote-tracking branch 'remotes/upstream/dev' into atmomerge
2014-06-27 10:18:17 +12: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
Chinsky
b9a2d2a1f5
Merge pull request #5366 from alex-gh/mutiny_runtime_fix
...
Fixes multiple runtimes in mutiny mode.
2014-06-27 01:12:46 +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
mwerezak
0f2ea177c9
Improves shuttle ETA calculation
2014-06-26 13:30:44 -04:00
Loganbacca
2218164df9
Bug fix and mapping example
...
- Fixed mapped omni devices being set to off at round start
- Remapped the research outpost atmos room, taking advantage of omni devices
2014-06-26 21:10:17 +12:00
Loganbacca
9c80541936
Mapper sanity checks
...
- Checks that mapped values add up to 100% so mappers can't set unusual ratios
2014-06-26 15:40:10 +12:00
Loganbacca
5af82714b2
Omni device tweaks
...
- Better mapping support (mapping icons and can now set mixer concentration)
- Trimmed overlay lists
- Utilized existing procs for icon generation
- Changed filter icon color to better contrast the output color
2014-06-26 14:55:53 +12: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
alex-gh
8810d3db71
Fixes multiple runtimes in mutiny mode.
...
Example runtime:
runtime error: Cannot read null.assigned_role
proc name: get crew to terminate (/datum/directive/terminations/financial_crisis/get_crew_to_terminate)
source file: financial_crisis_directive.dm,11
usr: null
src: /datum/directive/terminations/... (/datum/directive/terminations/financial_crisis)
call stack:
/datum/directive/terminations/... (/datum/directive/terminations/financial_crisis): get crew to terminate()
/datum/directive/terminations/... (/datum/directive/terminations/financial_crisis): meets prerequisites()
mutiny (/datum/game_mode/mutiny): get directive candidates()
mutiny (/datum/game_mode/mutiny): pre setup()
/datum/controller/gameticker (/datum/controller/gameticker): setup()
/datum/controller/gameticker (/datum/controller/gameticker): pregame()
/datum/controller/game_control... (/datum/controller/game_controller): setup()
2014-06-26 00:43:53 +02:00
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
96e584d517
Adds escape pod docking controllers
2014-06-25 13:08:22 -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
mwerezak
c44ac554dd
Improves multi-airlock docking UI
2014-06-25 12:28:58 -04:00
mwerezak
bb38379138
Improves simple docking controller UI
2014-06-25 12:26:07 -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
Loganbacca
71ff9f7671
Add omni devices to dispenser
...
- Added omni filters and mixers to pipe dispenser
- Added construction code
- A couple more cosmetic tweaks
2014-06-25 23:17:45 +12:00
Loganbacca
095ab7d97c
Added omni filters
...
- Added omni gas filter
- Cleaned up some code in mixer.dm and omni_base.dm
2014-06-25 23:17:44 +12:00
Loganbacca
4d4947021e
Atmos Overhaul - Phase 1
...
- Implements omni device core framework
- Adds omni gas mixer
2014-06-25 23:17:44 +12:00
Loganbacca
493ecdeb9e
Pipe fixes
...
- Cleans up silent pipe deleting (now creates a loose pipe item where the pipe section was)
- Allows pipe painters to paint disconnected pipes
- Removes OOC message from IC feedback
2014-06-25 23:17:44 +12: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
717a697fe2
Adds escape shuttle docking controllers
2014-06-25 00:21:52 -04:00
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
079a52de6a
Adds multi-airlock docking controller
2014-06-25 00:21:00 -04:00
mwerezak
bdafc1136f
Fixes airlocks being stuck if they run out of air
2014-06-25 00:20:37 -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
DJSnapshot
ba404cf602
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop
2014-06-24 16:38:38 -07:00
