Zuhayr
165f30b274
Merge pull request #10906 from PsiOmegaDelta/150827-RoundTime
...
Alters the round duration format, increases Stat inactivity timeout.
2015-08-29 07:41:23 +09:30
mwerezak
3e967872a3
Allows grabs to be resisted while weakened
2015-08-28 14:08:59 -04:00
mwerezak
32256682bf
Merge pull request #10921 from DeeUnderscore/intercom-fix
...
Re-add intercom Say :i fix
2015-08-28 13:42:33 -04:00
Daranz
d5b618adac
Fix Say ":i" working with intercoms, re-add restraint check for Say ":i"
...
See also commits:
e9d9ff57babbc8ad6383b9dbeeb356
2015-08-28 17:33:52 +02:00
GinjaNinja32
27bcd519b4
Merge pull request #10917 from PsiOmegaDelta/150828-Mapping
...
Fixes magically rotated windoors.
2015-08-28 09:23:50 +01:00
Chinsky
c642e8c729
Merge pull request #10907 from PsiOmegaDelta/150827-AdminLogs
...
Improved admin logging.
2015-08-28 10:32:35 +03:00
PsiOmegaDelta
64b06c6e02
Fixes magically rotated windoors.
...
Sorted on dev-freeze already, didn't consider this being a potential master issue. Fixes #10916 .
2015-08-28 08:06:31 +02:00
Zuhayr
691be4bd0c
Merge pull request #10910 from Baystation12/Ccomp5950-kjlfdafdas
...
Update motd.txt
2015-08-28 06:48:50 +09:30
Ccomp5950
a6e426c864
Update motd.txt
...
Something something new link.
2015-08-27 16:24:43 -04:00
GinjaNinja32
23f5581a35
Merge pull request #10894 from mwerezak/moderate-virus
...
Makes moderate virus events one-shot
2015-08-27 19:46:11 +01:00
PsiOmega
f68275d91b
Improved admin logging.
...
log_and_message_admins() (which sure needs a shorter name) now uses key_name_admin() instead of just key_name().
Replaces calls to admin_log_and_message_admins() which did this with log_and_message_admins() instead.
2015-08-27 20:20:20 +02:00
PsiOmega
c5e09c30d6
Alters the round duration format, increases Stat inactivity timeout.
...
Round duration now has a similar format to round time.
Stat inactivity timeout is now 10 minutes instead of 1 minute.
2015-08-27 20:01:38 +02:00
Peliia
8743cd89a4
Dish Incubator v2
...
Adheres to pointers laid out by Ginja.
2015-08-27 18:59:16 +02:00
Zuhayr
9a23275755
Merge pull request #10893 from mwerezak/zonemerge-fix
...
Backports fix for areas not venting when both airlock doors are forced open
2015-08-27 07:09:50 +09:30
Zuhayr
701282d2b0
Merge pull request #10889 from PsiOmegaDelta/150826-AdjacentStripping
...
Must now be adjacent to mobs you are stripping.
2015-08-27 06:51:54 +09:30
mwerezak
f16be46a56
Makes moderate virus events one-shot
2015-08-26 14:39:29 -04:00
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
Peliia
a0a8b2865c
Pathogenic Isolator
...
Fixes the Isolator saying "unidentified" for every entry on the List screen.
2015-08-26 16:11:01 +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
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
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
566c160765
Fixes #10836
2015-08-24 18:06:49 -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
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
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
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
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
