Zuhayr
5068fe33b9
Merge pull request #3169 from Segrain/master
...
Autopsy bugfix.
2013-06-26 05:59:50 -07:00
Segrain
d5620f9bb0
Changelog update.
2013-06-26 16:18:08 +03:00
Segrain
a944cda68e
Autopsy fix.
2013-06-26 16:12:32 +03:00
Segrain
91ab249681
Helper update.
2013-06-26 16:11:10 +03:00
Vetinari
0d5a543623
Medbay Fixes for #3160 & Other
...
Removes airless tiles, fixes up CMO office, adds lights to viro
corridor, moves a couple holopads in medbay around.
Sets Bar East camera to correct network (SS13), Moves redundant security
holopad.
2013-06-26 22:47:53 +10:00
Chinsky
bc47b0a1b5
Merge pull request #3167 from Kilakk/bleeding-edge-freeze
...
Adds fancy batch files for preparemap and cleanmap in maptools
2013-06-25 18:55:34 -07:00
Kilakk
5d0f112a80
Adds new_clean.bat
...
Fancy map cleaner now with 150% more FANCY.
Essentially:
Asks you which map to clean out of ../maps/
Yells at you if the map isn't backed up
Yells at you if what you chose isn't actually a map
Runs the MapPatcher.jar thing
2013-06-25 21:18:28 -04:00
Kilakk
069e4aee1c
Adds new_prepare.bat
...
Fancy map backups now with 150% more choices
2013-06-25 21:15:45 -04:00
Whitellama
bf953679c7
No more placeholder antags, and WIP space ninja gamemode stuff
2013-06-25 16:49:53 -07:00
Whitellama
41c8e8fe3f
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-25 16:47:15 -07:00
Zuhayr
10170f0c03
Merge pull request #3164 from Zuhayr/feature
...
Fixes, dartgun tweaks.
2013-06-25 07:07:44 -07:00
Zuhayr
e7cf8fa613
Adjustments to a wonky examine string for vox magboots.
2013-06-26 00:03:03 -07:00
Zuhayr
3c7bd1f527
Dartgun tweaks and vox raider spawn equipment changes.
2013-06-26 00:00:55 -07:00
Zuhayr
a877a2a9a8
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-25 23:55:01 -07:00
Zuhayr
e363157b2a
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-25 23:54:47 -07:00
Zuhayr
722a336e2a
Attempted fix to non-refreshing window.
2013-06-25 23:30:13 -07:00
Zuhayr
30cce4fc03
Fixes simple animal pinning.
2013-06-25 22:29:44 -07:00
Zuhayr
a0624c4c4d
Fixes pinning without embedding.
2013-06-25 22:27:40 -07:00
Zuhayr
a0aa02b815
Fixes broken vox raid spawning, hopefully.
2013-06-25 22:15:32 -07:00
Zuhayr
c64bb2f604
Merge pull request #3161 from Vetinarix/bleeding-edge-freeze
...
Medbay Fixes
2013-06-25 07:06:53 -07:00
Zuhayr
6f0d2d37d4
Merge pull request #3163 from CIB/bleeding-edge-freeze
...
Fixed a severe bug with robot components.
2013-06-25 06:50:18 -07:00
cib
b0cabba481
Fixed a severe bug with robot components.
...
There were several desyncs between robot.cell and robot.components["power cell"].installed, leading to very annoying bugs.
2013-06-25 15:00:58 +02:00
meyar
b62100ea4b
Because sandbox is broken. And fuck sandbox.
2013-06-25 07:32:04 -04:00
meyar
b7c364dba3
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-25 07:31:17 -04:00
Chinsky
a0e3feeadd
Merge pull request #3162 from Segrain/bleeding-edge-freeze
...
Multitile doors quickfix.
2013-06-25 01:11:00 -07:00
Segrain
29903c46e3
Quickfix for multitile doors.
2013-06-25 11:40:01 +03:00
meyar
3fcdf851f0
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-25 02:44:39 -04:00
Zuhayr
aa60c58ecb
Allows robots to understand all alien languages.
2013-06-24 22:57:36 -07:00
Vetinari
bdd67165cf
Atmos Fixes
...
Atmos fixes
2013-06-25 15:14:07 +10:00
Vetinari
ccac1e2277
Medbay Map Fixes
...
Fixes atmos entering misc research, adds photocopier near front,
replaces foor tile beneath virology internals cabinet, etc etc, small
fixes
2013-06-25 15:03:20 +10:00
Whitellama
f3224bba2e
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-24 21:48:33 -07:00
Zuhayr
289bb33432
Merge branch 'feature' of https://github.com/Zuhayr/Baystation12
2013-06-24 21:07:57 -07:00
Zuhayr
31f80350a7
Merge pull request #3159 from Zuhayr/master
...
AIize() runtime fix.
2013-06-24 21:07:28 -07:00
Zuhayr
479d7a058f
Fixes #3154
2013-06-25 14:07:54 -07:00
Zuhayr
59119fea07
Fixes #3146
2013-06-24 22:09:03 -07:00
Zuhayr
2265e8e0b9
Fixes #2815
2013-06-24 21:55:21 -07:00
Zuhayr
b3ba567099
Fixes #3145
2013-06-24 21:31:38 -07:00
Zuhayr
f5cc695c19
Merged airlock assembly changes and ZAS changes, hopefully.
2013-06-24 21:06:51 -07:00
Zuhayr
bff96e3fb7
Added holobadges, Security-imprintable display accessories.
2013-06-24 20:55:24 -07:00
Zuhayr
12daf1f245
Merge pull request #3158 from Furlucis/master
...
Again with the changeling stab aiming
2013-06-24 20:45:25 -07:00
Zuhayr
9d19aa8864
Merge pull request #3157 from SkyMarshal/bleeding-edge-freeze
...
Added a better framework for multi-tile doors, pulling works strangely though.
2013-06-24 20:19:56 -07:00
SkyMarshal
aa85e757d4
Added a better framework for multi-tile doors, pulling works strangely though.
2013-06-24 17:21:55 -07:00
Zuhayr
9f487038f2
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-24 16:18:01 -07:00
Mloc
92f087c199
Merge pull request #3155 from Zuhayr/master
...
Bug fixes.
2013-06-24 15:01:35 -07:00
Furlucis
674269e315
Made changeling absorbing leave proper wounds and be aimable.
...
Signed-off-by: Furlucis <Logman115@gmail.com >
2013-06-24 17:35:55 -04:00
Jim "Apples"
9823537c65
Merge pull request #3153 from Zuhayr/feature
...
Ikky's holobadges, SkyMarshal's ZAS fix (merged with Segrain's airlock changes), robot language understanding.
2013-06-24 14:16:51 -07:00
MisterBook
9a62219a1f
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-24 13:09:33 -05:00
Zuhayr
3d65dff676
Merge pull request #3143 from Segrain/bleeding-edge-freeze
...
Construction update.
2013-06-24 01:20:32 -07:00
Segrain
f97f3596a6
Punctuation fix.
2013-06-24 12:03:47 +03:00
Segrain
ca635a37f3
Conflict fix. I hope.
2013-06-24 12:02:03 +03:00
