Zuhayr
|
b7c95f9c00
|
Merge pull request #10880 from Baystation12/dev-freeze
Dev freeze
|
2015-08-26 03:22:06 +09:30 |
|
Zuhayr
|
d567e775a8
|
Merge pull request #10879 from Zuhayr/dev-freeze
Dev freeze
|
2015-08-26 03:15:32 +09:30 |
|
Zuhayr
|
f4d27e8b1c
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
code/modules/admin/verbs/adminsay.dm
|
2015-08-26 03:09:11 +09:30 |
|
Ccomp5950
|
2a38a18c4c
|
Merge pull request #10831 from mwerezak/msay
Changes MSAY to show the ckey/character name like it does with asay
|
2015-08-25 09:48:20 -04:00 |
|
PsiOmegaDelta
|
70e9a0dadb
|
Merge pull request #10874 from Baystation12/revert-10860-patch-1
Revert "IAA cartridge tweak"
|
2015-08-25 12:59:05 +02:00 |
|
PsiOmegaDelta
|
d02108043c
|
Revert "IAA cartridge tweak"
|
2015-08-25 12:48:42 +02:00 |
|
Zuhayr
|
9b3d21fe1c
|
Merge pull request #10868 from comma/detrevert
Fixes inconsistency in Detective job datum
|
2015-08-25 18:27:30 +09:30 |
|
PsiOmegaDelta
|
03695f7133
|
Merge pull request #10872 from PsiOmegaDelta/dev
Dev
|
2015-08-25 08:29:44 +02:00 |
|
PsiOmegaDelta
|
51503a9220
|
Updates Travis' macro count.
|
2015-08-25 08:25:16 +02:00 |
|
PsiOmegaDelta
|
2fdf859122
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
|
2015-08-25 08:20:13 +02:00 |
|
PsiOmegaDelta
|
11356833a4
|
Merge pull request #10871 from PsiOmegaDelta/dev-freeze
Dev freeze
|
2015-08-25 08:16:00 +02:00 |
|
PsiOmegaDelta
|
713a7bd654
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/game/objects/items/devices/flashlight.dm
|
2015-08-25 08:12:39 +02:00 |
|
mwerezak
|
b025a16a6c
|
Merge pull request #10867 from Baystation12/revert-10862-nanoui
Revert "Fixes #7884, should fix #10859"
|
2015-08-25 00:00:52 -04:00 |
|
Chinsky
|
77f2163fb3
|
Merge pull request #10406 from Zuhayr/randmap
Supply drops.
|
2015-08-25 06:17:19 +03:00 |
|
Zuhayr
|
f4c9bc4be6
|
Amending some loc setting lines.
|
2015-08-25 12:40:09 +09:30 |
|
Zuhayr
|
9087466552
|
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap
|
2015-08-25 12:29:59 +09:30 |
|
Chinsky
|
c1dc9d3f7e
|
Revert "Fixes #7884, should fix #10859"
|
2015-08-25 03:35:19 +03:00 |
|
Chinsky
|
3ccbe22152
|
Fixes inconsistency in Detective job datum
There was only 1 slot, but you could spawn 2 during roundstart.
|
2015-08-25 03:27:54 +03:00 |
|
Zuhayr
|
bcca0d4aee
|
Merge pull request #10842 from mwerezak/showers
Fixes cryogenic showers
|
2015-08-25 07:38:19 +09:30 |
|
Chinsky
|
5dbd5252d6
|
Merge pull request #10862 from GinjaNinja32/nanoui
Fixes #7884, should fix #10859
|
2015-08-25 00:40:01 +03:00 |
|
GinjaNinja32
|
8a2d2b4c2c
|
Merge pull request #10861 from mwerezak/flashlight
Clean up of the flashlight icon fix
|
2015-08-24 22:17:57 +01:00 |
|
GinjaNinja32
|
a2c121ed50
|
Fixes #7884, should fix #10859
|
2015-08-24 21:59:12 +01:00 |
|
HarpyEagle
|
e03585898d
|
Cleans up flashlight fix
Moves icon state changes into update_icon(), less duplicated code. Also
makes glowing slime extracts less dumb.
|
2015-08-24 16:31:31 -04:00 |
|
PsiOmegaDelta
|
6e75328341
|
Merge pull request #10860 from Sligneris/patch-1
IAA cartridge tweak
|
2015-08-24 22:10:23 +02:00 |
|
mwerezak
|
9e65e63b97
|
Merge pull request #10858 from GinjaNinja32/more-equal
fix equalize() not equalizing gases
|
2015-08-24 15:54:44 -04:00 |
|
Sligneris
|
d74b8f9dc3
|
IAA cartridge tweak
Adds Employment Records to IAA cartridges.
|
2015-08-24 21:43:39 +02:00 |
|
GinjaNinja32
|
9a5da57d60
|
fix heatcap calculation in equalize()
|
2015-08-24 19:33:37 +01:00 |
|
GinjaNinja32
|
8521df47f3
|
fix equalize() not equalizing gases
|
2015-08-24 19:24:55 +01:00 |
|
Zuhayr
|
d7650f55ea
|
Merge pull request #10856 from PsiOmegaDelta/150824-OrganCrawling
Having organs should no longer prevent vent crawling.
|
2015-08-25 01:02:54 +09:30 |
|
PsiOmega
|
f28fa29d54
|
Having organs should no longer prevent vent crawling.
|
2015-08-24 17:27:22 +02:00 |
|
Zuhayr
|
0012470db2
|
Merge pull request #10854 from PsiOmegaDelta/150824-UndressMeEverywhere
Shuffles de-equipping logic.
|
2015-08-24 21:59:59 +09:30 |
|
PsiOmega
|
1a11aa7f5c
|
Shuffles de-equipping logic.
|
2015-08-24 14:24:31 +02:00 |
|
GinjaNinja32
|
da43277765
|
Merge pull request #10851 from PsiOmegaDelta/150824-CorrectCanUseTopicBaseCase
Corrects CanUseObjTopic base proc
|
2015-08-24 12:15:42 +01:00 |
|
PsiOmegaDelta
|
358e50d856
|
Corrects CanUseObjTopic base proc.
Now returns 1 instead of 0.
|
2015-08-24 12:16:18 +02:00 |
|
PsiOmegaDelta
|
3de6d1b19c
|
Merge pull request #10381 from Zuhayr/hardsuitcontrol
Rig AI movement and module control buffs.
|
2015-08-24 12:04:31 +02:00 |
|
Zuhayr
|
77e0a72911
|
Adding tag to droppod mobs prior to being moved into the target area.
|
2015-08-24 19:13:43 +09:30 |
|
Zuhayr
|
c5972cb421
|
Removing an istype() check.
|
2015-08-24 19:03:57 +09:30 |
|
Zuhayr
|
3415f88cc2
|
Reverting a nonfunctional H to usr change.
|
2015-08-24 19:02:34 +09:30 |
|
Zuhayr
|
c6964a9b0e
|
Fixes for previous commits.
|
2015-08-24 18:31:52 +09:30 |
|
PsiOmegaDelta
|
fd77756b5b
|
Merge pull request #10848 from PsiOmegaDelta/dev
Dev
|
2015-08-24 10:49:28 +02:00 |
|
PsiOmegaDelta
|
e29f4eb3c1
|
Compilation and map merge fixes.
|
2015-08-24 10:45:08 +02:00 |
|
PsiOmegaDelta
|
c040d4b951
|
Updates changelog.
|
2015-08-24 10:32:30 +02:00 |
|
PsiOmegaDelta
|
9057655da6
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/modules/clothing/clothing.dm
code/modules/clothing/spacesuits/spacesuits.dm
code/modules/clothing/spacesuits/void/merc.dm
code/modules/clothing/spacesuits/void/void.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/silicon/ai/ai.dm
|
2015-08-24 10:31:30 +02:00 |
|
PsiOmegaDelta
|
0ae53ab55c
|
Merge pull request #10847 from PsiOmegaDelta/dev-freeze
Dev freeze
|
2015-08-24 10:27:52 +02:00 |
|
PsiOmegaDelta
|
c376c08cc0
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/game/objects/structures/girders.dm
code/modules/mob/living/carbon/human/human_damage.dm
|
2015-08-24 10:23:12 +02:00 |
|
PsiOmegaDelta
|
3d3ab737a4
|
Merge pull request #10846 from PsiOmegaDelta/master
Updates changelog.
|
2015-08-24 10:20:07 +02:00 |
|
PsiOmegaDelta
|
2e09278a7e
|
Updates changelog.
|
2015-08-24 10:16:56 +02:00 |
|
Zuhayr
|
23564bda0c
|
Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess
Synths now relies on access permissions as well.
|
2015-08-24 17:45:10 +09:30 |
|
Zuhayr
|
863d75076d
|
Merge pull request #10759 from mwerezak/girders
Fixes reinforcing girders through windows, adds an SS13-like interface for reinforcing
|
2015-08-24 17:28:08 +09:30 |
|
Zuhayr
|
4a64862c52
|
Merge pull request #10839 from mwerezak/antag-fix
Fixes #10742
|
2015-08-24 17:27:47 +09:30 |
|