mwerezak
|
ec7f60f9ad
|
Allows indirectly connected turfs to merge zones if either zone is small enough.
Fixes #9235
Conflicts:
code/ZAS/Controller.dm
|
2015-08-26 14:25:43 -04:00 |
|
Peliia
|
d9e940c3a6
|
Dish Incubator Limits
Imposes limits on the Dish Incubator, it shall no longer have values above the meters on the display.
|
2015-08-26 17:12:30 +02:00 |
|
Peliia
|
89629b686f
|
Dish Incubator
Now the Incubator should stop magically conjuring food whenever there is a beaker without food inside.
|
2015-08-26 16:18:36 +02:00 |
|
PsiOmegaDelta
|
9c5aba72f0
|
Must now be adjacent to mobs you are stripping.
Fixes #10884.
|
2015-08-26 08:12:02 +02:00 |
|
Zuhayr
|
a6604b2ca2
|
Merge pull request #10830 from mwerezak/lighting
Fixes #10465, escape pod lighting and raider spaceacillin
|
2015-08-26 05:50:37 +09:30 |
|
Zuhayr
|
5197178d2b
|
Merge pull request #10878 from PsiOmegaDelta/150825-SpecialMsay
Restores special admin color in Msay
|
2015-08-26 05:50:14 +09:30 |
|
Chinsky
|
905b414da0
|
Merge pull request #10866 from Kearel/fix
Fixes #10834, #10836, #10833
|
2015-08-25 20:53:20 +03:00 |
|
Zuhayr
|
950359f629
|
Merge pull request #10873 from GinjaNinja32/nanoui
fix #7884, fix #10859
|
2015-08-26 03:19:51 +09:30 |
|
PsiOmega
|
949cfdfc5b
|
Restores special admin color in Msay
Restores the special appearance admin name's had when using MSAY, to differentiate them from the masses.
|
2015-08-25 19:06:52 +02:00 |
|
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 |
|
Zuhayr
|
9b3d21fe1c
|
Merge pull request #10868 from comma/detrevert
Fixes inconsistency in Detective job datum
|
2015-08-25 18:27:30 +09:30 |
|
GinjaNinja32
|
c1ff84dd97
|
properly fix #7884
|
2015-08-25 09:11:23 +01:00 |
|
GinjaNinja32
|
ec043ea392
|
Revert "Revert "Fixes #7884, should fix #10859""
This reverts commit c1dc9d3f7e.
|
2015-08-25 09:10:11 +01:00 |
|
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 |
|
Kearel
|
ea402d6714
|
#10833 +
|
2015-08-24 19:20:56 -05:00 |
|
Kearel
|
d1504b49b9
|
Fixes #10833
|
2015-08-24 18:12:38 -05:00 |
|
Kearel
|
c7d0496b20
|
Fixes #10834
|
2015-08-24 18:05:09 -05: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
|
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 |
|
mwerezak
|
9e65e63b97
|
Merge pull request #10858 from GinjaNinja32/more-equal
fix equalize() not equalizing gases
|
2015-08-24 15:54:44 -04: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 |
|
PsiOmegaDelta
|
57465d0dfb
|
Tries to relocate Cult/Occult languages to unused keys.
Now uses f and y. Fixes #10799.
|
2015-08-24 17:35:56 +02:00 |
|
PsiOmega
|
f28fa29d54
|
Having organs should no longer prevent vent crawling.
|
2015-08-24 17:27:22 +02:00 |
|
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 |
|
PsiOmegaDelta
|
0b163b89ae
|
Fixes #10815.
Now uses audible message. Added a message for deaf mobs.
|
2015-08-24 09:16:35 +02:00 |
|
Kelenius
|
d2ee97c6b7
|
You guys are hard to please
|
2015-08-24 09:59:57 +03:00 |
|
Zuhayr
|
ddcf7ec282
|
Merge pull request #10837 from mwerezak/brainloss-fix
Fixes adjustBrainLoss
|
2015-08-24 15:24:12 +09:30 |
|
mwerezak
|
286e16a0f3
|
Fixes cryogenic showers
Changes shower temperature settings to use more reasonable temperature values. A menu is now shown when adjusting shower temperature.
|
2015-08-24 00:11:40 -04:00 |
|
mwerezak
|
75f19938b3
|
Fixes an apparent clonexadone typo
|
2015-08-24 00:04:03 -04:00 |
|
mwerezak
|
c8da3f0590
|
Fixes #10742
|
2015-08-23 22:28:29 -04:00 |
|
mwerezak
|
09f1c6054b
|
Changed MSAY to show the ckey/character name like it does with asay
|
2015-08-23 20:27:56 -04:00 |
|
mwerezak
|
5bcede5801
|
Fixes adjustBrainLoss
adjustBrainLoss() was giving damage to the brain organ and then setting it back to brainloss, undoing the change.
|
2015-08-23 20:22:15 -04:00 |
|
mwerezak
|
7c96829ecd
|
Fixes #10828
Adds a slick red emergency light to the engineering escape pod, updates other pods to match.
|
2015-08-23 18:19:22 -04:00 |
|
Chinsky
|
1a7b0e33a4
|
Merge pull request #10758 from FrickenChris101/patch-1
Flashlight Icon toggle fix
|
2015-08-24 00:40:26 +03:00 |
|
Chinsky
|
13257b52c4
|
Merge pull request #10824 from mwerezak/stump-desc-fix
Fixes limb stump examine text
|
2015-08-24 00:31:05 +03:00 |
|
mwerezak
|
39feaf0870
|
Space areas no longer use dynamic lighting
|
2015-08-23 17:05:56 -04:00 |
|
Ccomp5950
|
517b685950
|
Merge pull request #10822 from mwerezak/antag-fix
Antag Fixes
|
2015-08-23 16:24:42 -04:00 |
|
Raptor1628
|
dfeb43c496
|
Reduces Detective slots.
One detective to compensate for Security Officer, requested by Virgil
after Officer PR.
|
2015-08-23 15:37:24 -04:00 |
|
mwerezak
|
3c86715474
|
Fixes limb stump examine text
|
2015-08-23 15:35:45 -04:00 |
|
mwerezak
|
c16d4aca9a
|
Removes unncessary shuffle
|
2015-08-23 14:49:30 -04:00 |
|
mwerezak
|
161e5c14cd
|
Fixes #10819
|
2015-08-23 14:34:58 -04:00 |
|
mwerezak
|
20eeb394cb
|
Fixes #10793
|
2015-08-23 14:34:37 -04:00 |
|
Raptor1628
|
59c500d01b
|
Adds fourth security officer slot.
Discussed among admins, decision was made to make this change to master
and not dev. Approval from Virgil.
|
2015-08-23 13:20:41 -04:00 |
|
GinjaNinja32
|
663aae9786
|
Merge pull request #10816 from PsiOmegaDelta/150818-RealFunny
Rig AI fixes.
|
2015-08-23 13:33:24 +01:00 |
|
volas
|
d31203c70f
|
Sanitize for AI emergency message
|
2015-08-23 15:24:52 +03:00 |
|