volas
|
31360a344b
|
merge fix
|
2015-03-25 01:13:23 +03:00 |
|
volas
|
e3d41c3112
|
Merge remote-tracking branch 'upstream/dev' into sanitize_procs
|
2015-03-25 01:06:32 +03:00 |
|
volas
|
5fee41d4ba
|
sanitize() refactor: third pass (misc)
|
2015-03-25 01:05:21 +03:00 |
|
Chinsky
|
959ee07119
|
Merge pull request #8607 from Kelenius/ofDrillsAndMiners
Updates drill and scanner
|
2015-03-24 20:05:25 +03:00 |
|
Kelenius
|
78bac425ad
|
Updates drill and scanner
|
2015-03-24 18:34:26 +03:00 |
|
Zuhayr
|
ff82dd6a42
|
Merge pull request #8606 from GinjaNinja32/roidconfig
Add GENERATE_ASTEROID line to example config file, defaulted to off.
|
2015-03-25 01:48:29 +10:30 |
|
GinjaNinja32
|
4095c7053d
|
Add GENERATE_ASTEROID line to example config file, defaulted to off.
|
2015-03-24 14:59:13 +00:00 |
|
PsiOmegaDelta
|
89965420bb
|
Merge pull request #8603 from Baystation12/dev-freeze
Dev freeze
|
2015-03-24 14:00:57 +01:00 |
|
Zuhayr
|
3bdd352b13
|
Merge pull request #8597 from Zuhayr/dev-freeze
Fixes
|
2015-03-24 23:14:22 +10:30 |
|
Zuhayr
|
fa4c63f8d5
|
Merge pull request #8596 from Zuhayr/dev
Fixes #8589
|
2015-03-24 23:14:20 +10:30 |
|
Zuhayr
|
7e615521ef
|
Should fix issues with invisible seeds/products/plants.
|
2015-03-24 13:51:44 +10:30 |
|
Zuhayr
|
45f28d5372
|
Fixes #8485
|
2015-03-24 13:20:24 +10:30 |
|
Zuhayr
|
ef50918b9c
|
Hackfix for #8588
|
2015-03-24 12:46:07 +10:30 |
|
Zuhayr
|
a57ba2e26b
|
Fixes #8589
|
2015-03-24 12:39:55 +10:30 |
|
Zuhayr
|
6c882d5773
|
Merge pull request #8595 from GinjaNinja32/door
Fixes depowered doors not being able to be closed
|
2015-03-24 10:36:17 +10:30 |
|
GinjaNinja32
|
89bbfbcfad
|
Fixes depowered doors not being able to be closed
|
2015-03-23 23:25:58 +00:00 |
|
PsiOmegaDelta
|
19af11fb2f
|
Merge pull request #8593 from PsiOmegaDelta/dev-freeze
Dev freeze
|
2015-03-23 21:15:07 +01:00 |
|
PsiOmega
|
bd48c76620
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
|
2015-03-23 21:14:32 +01:00 |
|
PsiOmegaDelta
|
c85e1ce786
|
Merge pull request #8592 from comma/maxlen
Readded missing check for paper editing
|
2015-03-23 21:13:43 +01:00 |
|
Chinsky
|
a9ee51bc64
|
Readded missing check for paper editing
Removed it back when HTML in paper was a thing again adn never put back in, can possibly cause issues.
Thanks @volas for noticing.
|
2015-03-23 23:02:43 +03:00 |
|
Zuhayr
|
14950a7e3a
|
Merge pull request #8584 from Kelenius/ofBorgsAndGlass
Fixed construction borg's Rglass
|
2015-03-23 21:34:36 +10:30 |
|
PsiOmegaDelta
|
d518df1076
|
Merge pull request #8586 from PsiOmegaDelta/dev
Dev
|
2015-03-23 11:47:57 +01:00 |
|
PsiOmega
|
2a17d656f2
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
|
2015-03-23 11:47:15 +01:00 |
|
PsiOmegaDelta
|
c68c527107
|
Merge pull request #8585 from PsiOmegaDelta/dev-freeze
Dev freeze
|
2015-03-23 11:46:42 +01:00 |
|
PsiOmega
|
1908ba59e2
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
|
2015-03-23 11:45:32 +01:00 |
|
Kelenius
|
026ec265d4
|
Fixed construction borg's Rglass
|
2015-03-23 12:11:58 +03:00 |
|
Zuhayr
|
a454e77444
|
Merge pull request #8573 from PsiOmegaDelta/StrayCharacter
Fixes stray character.
|
2015-03-23 10:55:08 +10:30 |
|
Zuhayr
|
1474c6fdd1
|
Merge pull request #8574 from PsiOmegaDelta/AIDel
Deletes AI eye along with the AI.
|
2015-03-23 10:54:36 +10:30 |
|
volas
|
f8822626bb
|
sanitize() refactor: second pass(other sanitize functions)
|
2015-03-23 01:38:09 +03:00 |
|
volas
|
855755f808
|
sanitize() refactor: first pass (sanitize)
|
2015-03-22 23:31:19 +03:00 |
|
Chinsky
|
f4dd077d50
|
Merge pull request #8571 from PsiOmegaDelta/EyeFix
Fixes #8534.
|
2015-03-22 21:47:17 +03:00 |
|
Chinsky
|
f72d5e10ef
|
Merge pull request #8570 from PsiOmegaDelta/AIForcedShutters
Emergency shutters opened by silicons no longer autoclose.
|
2015-03-22 21:47:12 +03:00 |
|
Chinsky
|
61bd900d19
|
Merge pull request #8567 from Zuhayr/dev-freeze
Rebalanced xenoflora sprites, fixed numerous issues.
|
2015-03-22 21:47:09 +03:00 |
|
PsiOmega
|
767f4dd537
|
Deletes AI eye along with the AI.
|
2015-03-22 18:51:15 +01:00 |
|
PsiOmega
|
9286f10a35
|
Fixes stray character.
|
2015-03-22 18:45:03 +01:00 |
|
volas
|
a5cfca1ee8
|
Merge remote-tracking branch 'upstream/dev' into sanitize_procs
Conflicts:
code/__HELPERS/text.dm
|
2015-03-22 20:37:17 +03:00 |
|
PsiOmegaDelta
|
6394152730
|
Merge pull request #8360 from Zuhayr/gamemode
Game mode and antagonist refactor, heist rework.
|
2015-03-22 17:14:28 +01:00 |
|
PsiOmega
|
f9b8c2dbc9
|
Fixes #8534.
Sets icontype to its proper value.
|
2015-03-22 16:25:24 +01:00 |
|
PsiOmega
|
8562195f05
|
Emergency shutters opened by silicons no longer autoclose.
|
2015-03-22 14:57:12 +01:00 |
|
Zuhayr
|
ad80292752
|
Merge pull request #8556 from GinjaNinja32/skills
Fix issues with skill class procs
|
2015-03-23 00:08:32 +10:30 |
|
Zuhayr
|
8791c2bf1e
|
Fixing a typo.
! and ~ both compile. Feh.
|
2015-03-23 00:05:29 +10:30 |
|
Zuhayr
|
9deebbf9f6
|
Vines should now respect coverage and magboots.
|
2015-03-22 16:25:22 +10:30 |
|
Zuhayr
|
bf8ad6d585
|
Rebalanced xenoflora sprites, fixed numerous issues.
|
2015-03-22 16:13:15 +10:30 |
|
GinjaNinja32
|
26d878fb02
|
Move closing bracket outside <i> tag
Opening bracket is outside. Consistency!
|
2015-03-21 21:08:54 +00:00 |
|
Zuhayr
|
a8f44cae98
|
Resolving bugs with spawn order and delays.
|
2015-03-21 11:49:42 +10:30 |
|
Zuhayr
|
d8018db5c9
|
Finally got things working from vote to roundstart to join to death.
|
2015-03-21 11:14:59 +10:30 |
|
Zuhayr
|
fe6cd5af13
|
Dropped antagonist folder down a directory level.
|
2015-03-21 11:14:48 +10:30 |
|
Zuhayr
|
4d14722b2a
|
Split antagonist.dm up.
|
2015-03-21 11:14:47 +10:30 |
|
Zuhayr
|
3718245e45
|
Moves asteroid generation prior to geometry initialization. Adds config for asteroid generation.
|
2015-03-21 11:13:53 +10:30 |
|
Zuhayr
|
2c269e5159
|
More work on Heist. Remapped the Vox shuttle and added a base for it. Tweaked spawn values etc.
|
2015-03-21 11:13:48 +10:30 |
|