mwerezak
d6498cd45f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dislocation
...
Conflicts:
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/carbon/human/human_organs.dm
2015-04-13 17:12:02 -04:00
mwerezak
da5518f8b2
Updates various dependencies on organ brokenness to use the is_broken() proc. Updates external organ brokenness to ensure broken description is set.
2015-04-13 16:38:33 -04:00
Zuhayr
03b85a5cb4
Merge pull request #8835 from Zuhayr/dev
...
Removed some cocked up files.
2015-04-13 23:02:41 +09:30
Zuhayr
7129feb417
Removed some cocked up files.
2015-04-13 22:58:32 +09:30
PsiOmegaDelta
095a572c71
Merge pull request #8829 from Techhead0/voidtank
...
Installable Voidsuit tanks.
2015-04-13 13:57:56 +02:00
PsiOmegaDelta
7363068471
Merge pull request #8833 from GinjaNinja32/dev
...
dev-freeze -> dev
2015-04-13 13:56:11 +02:00
GinjaNinja32
d4eb42b38b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/projectiles/targeting.dm
2015-04-13 12:49:07 +01:00
Zuhayr
6cf08526bc
Merge pull request #8831 from Zuhayr/dev-freeze
...
Fast forward?
2015-04-13 20:49:04 +09:30
Zuhayr
f205ce4327
Merge pull request #8828 from PsiOmegaDelta/Mapping
...
Map fixes.
2015-04-13 19:36:41 +09:30
Techhead0
c8487db13b
Eject Tank verb and span classes
...
Now you can eject your tank onto the ground while wearing the suit.
Toggle Helmet verb now uses span classes.
2015-04-13 05:02:20 -04:00
PsiOmega
c616b67621
Map fixes.
...
Fixes #8441 .
Fixes #8820 .
Less stacked pipes.
Medbay now powers all its shutters.
Fixes duplicate req_access definitions.
2015-04-13 08:44:13 +02:00
Chinsky
886ddd7021
Merge pull request #8822 from Baystation12/dev-freeze
...
0.1.18 Dev freeze
2015-04-13 09:20:08 +03:00
PsiOmegaDelta
f988545ed5
Merge pull request #8827 from comma/dev-freeze
...
Some fixes
2015-04-13 08:17:53 +02:00
Chinsky
10699ccfa3
Fixes #8473
...
..() doesn't really do anything meaningful, so it always returned null. Left it there just in case, but at least now it doesn't stop un-lightening.
2015-04-13 07:35:23 +03:00
Chinsky
c3d91fbb37
Fixes #8818
2015-04-13 07:21:54 +03:00
Chinsky
271977dd7e
Fixes #8537
...
Apparently drying racks don't actually do anything, but at least now they can do nothing on all the grown fruits! Also added some darkening so people feel like they were slightly less cheated.
2015-04-13 07:19:40 +03:00
Chinsky
d6d005db6a
Fixes #8550
2015-04-13 06:41:58 +03:00
Chinsky
d39cc9686d
Fixes #8687
2015-04-13 06:25:30 +03:00
Chinsky
b436925a33
Fixes #8735
2015-04-13 03:54:29 +03:00
Chinsky
870b090d36
Merge pull request #8782 from volas/dev
...
Small fix after merge
2015-04-12 21:18:14 +03:00
Chinsky
6922b0c321
Merge pull request #8817 from PsiOmegaDelta/InteliFix
...
Fixes AIs inside inteliCards being unable to interact with the world.
2015-04-12 21:17:29 +03:00
Chinsky
2dea2424cb
Merge pull request #8811 from Zuhayr/dev
...
Adds construction drones.
2015-04-12 18:21:34 +03:00
PsiOmega
6458d91d83
Fixes AIs inside inteliCards being unable to interact with the world around it.
...
Apparently being inside an object affects view() in unexpected ways.
2015-04-12 14:04:00 +02:00
Zuhayr
0223223c77
Merge pull request #8753 from Neerti/4-4-2015_borg_module_stuff
...
Revenge of the Research Module (and other stuff from that PR)
2015-04-12 13:16:45 +09:30
Zuhayr
1758f52123
Fixes errors in previous commit, makes some tweaks.
2015-04-12 13:09:03 +09:30
Chinsky
0b7ac73f59
Merge pull request #8805 from PsiOmegaDelta/Engineering
...
Area/Camera network refactor - Part 3
2015-04-11 20:49:15 +03:00
Zuhayr
e833c14975
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-04-11 22:19:24 +09:30
Zuhayr
a029f88cfc
Added construction drone variant, updated the construction area map slightly.
2015-04-11 19:20:13 +09:30
Zuhayr
56019b80e6
Merge pull request #8813 from PsiOmegaDelta/Pooling
...
Fixes atom pooling return code.
2015-04-11 19:17:21 +09:30
PsiOmega
9181a2a43a
Fixes atom pooling return code.
2015-04-11 10:28:15 +02:00
Zuhayr
09b69db537
Merge pull request #8812 from Zuhayr/devmerge
...
Devmerge
2015-04-11 17:02:07 +09:30
=
78987a436a
Merge resolution.
2015-04-11 13:23:17 +09:30
Chinsky
7a40d193fe
Merge pull request #8801 from PsiOmegaDelta/NanoRefactorUmptheen
...
Refactors NanoUI interaction (again)
2015-04-11 04:43:50 +03:00
Chinsky
c9fc94e1ff
Merge pull request #8803 from Zuhayr/dev-freeze
...
Readds vox pariah.
2015-04-11 04:21:13 +03:00
Chinsky
be3f372680
Merge pull request #8788 from PsiOmegaDelta/PortedSpells
...
Ports /vg/'s spell system for use by the cult port.
2015-04-11 02:05:58 +03:00
Chinsky
690da7e42d
Merge pull request #8802 from PsiOmegaDelta/ISawTheRuntimes
...
Eye runtime fixes.
2015-04-11 02:05:51 +03:00
Chinsky
d4c9150db6
Merge pull request #8806 from PsiOmegaDelta/Weird
...
Fixes missing null alarm source.
2015-04-11 02:05:25 +03:00
PsiOmega
2836dcf648
Merge remote-tracking branch 'upstream/dev' into Engineering
2015-04-10 16:06:42 +02:00
PsiOmega
49d3f0fcf7
Merge remote-tracking branch 'upstream/dev' into NanoRefactorUmptheen
2015-04-10 15:49:36 +02:00
PsiOmegaDelta
efb340c970
Merge pull request #8808 from PsiOmegaDelta/dev
...
Dev
2015-04-10 15:31:42 +02:00
PsiOmega
1ba8dcbca9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/vending.dm
2015-04-10 15:25:34 +02:00
PsiOmegaDelta
4c44482dfc
Merge pull request #8807 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-04-10 15:22:48 +02:00
PsiOmega
ea528d04ea
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-04-10 15:21:57 +02:00
PsiOmega
080b0178ab
Fixes issue with the alarm monitor (only sometimes) listing a null missing alarm source.
2015-04-10 15:19:55 +02:00
PsiOmega
24fe95933e
Area/Camera network refactor - Part 3
...
Renames areas for more logical order in alarm consoles and other locations.
Begins dividing the cameras into separate networks instead of being dumped into SS13. Changes c-tags to ensure related cameras are sorted together.
Engineering/Outpost/Solars updated this run.
Also includes:
Fixes #8727 .
2015-04-10 15:17:05 +02:00
Zuhayr
d70ea77c2d
Moved stack into heist antag creation for pariah reinclusion.
2015-04-10 02:35:04 -07:00
PsiOmega
baa2fe0dfa
Eye runtime fixes.
...
Ensures the spawn in ai/New() doesn't attempt to update eyeobj if the AI was deleted before the timer.
2015-04-10 11:29:50 +02:00
Zuhayr
e4a0edb309
Readds CAN_JOIN to Vox for Ikky.
2015-04-10 02:28:38 -07:00
Chinsky
05da117d10
Merge pull request #8778 from PsiOmegaDelta/CivilianWest
...
Area/Camera network refactor - Part 2
2015-04-10 12:28:33 +03:00
Chinsky
a8bf62634e
Merge pull request #8774 from mwerezak/vending
...
Fixes #8771
2015-04-10 12:28:12 +03:00
