Zuhayr
89a7c9667b
Reverts a testing value.
2015-09-05 17:31:27 +09:30
GinjaNinja32
8311e06d2b
Merge pull request #11003 from Zuhayr/secretfix
...
Fixes Secret.
2015-09-05 07:17:47 +01:00
Chinsky
34662a83b5
Merge pull request #10998 from Zuhayr/antagsystem
...
Antag system fixes.
2015-09-05 07:56:42 +03:00
Zuhayr
a0187f66e3
Fixes Secret.
2015-09-05 14:12:20 +09:30
Zuhayr
f74182680c
Fixes autotraitor.
2015-09-05 13:15:30 +09:30
Zuhayr
7af1f27b28
More debug feedback.
2015-09-05 12:57:20 +09:30
Zuhayr
58cd8c3e03
Added debug verbs/feedback.
2015-09-05 12:05:32 +09:30
Zuhayr
c121993a11
Changed some vars around to be more explicit/descriptive, added documentation to main antag datum.
2015-09-05 11:23:48 +09:30
Zuhayr
12a5c47413
Added a proper cooldown on latespawn, added loyalist role to char setup.
2015-09-05 10:46:23 +09:30
Daranz
ddeec9c89a
Fix effects for clonexadone
2015-09-04 16:06:03 +02:00
Zuhayr
553ac01552
Autotraitor cleanup.
2015-09-04 20:17:47 +09:30
Zuhayr
09ee98717e
Fixes cortical borer spawning.
2015-09-04 19:19:29 +09:30
Zuhayr
23fb8d8b99
Antag system cleanup/fixes.
2015-09-04 18:28:05 +09:30
Chinsky
9728f28880
Merge pull request #10843 from PsiOmegaDelta/150924-CultSpeech
...
Relocates Cult/Occult languages to unused keys.
2015-09-03 20:37:16 +03:00
PsiOmega
6e2514d728
Beepsky should no longer attempt to arrest himself.
...
Adds additional threat check.
2015-09-01 18:25:51 +02:00
PsiOmegaDelta
fb670400a1
Merge pull request #10976 from caelaislinn/computer_fix
...
Fix for runtime in skills computer
2015-09-01 12:25:29 +02:00
Cael Aislinn
0228ca4959
fix for runtime in skills computer
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2015-09-01 20:05:42 +10:00
Chinsky
667debfb3c
Merge pull request #10745 from mwerezak/mob-grab
...
Cleans up mob_grab.dm
2015-09-01 12:58:50 +03:00
Zuhayr
cc0f4f7e90
Merge pull request #10964 from caelaislinn/telecomms_fix
...
Fixes an obscure runtime in telecomms code
2015-09-01 13:56:41 +09:30
Cael Aislinn
8f05e2f63a
fixes an obscure runtime in telecomms code
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2015-08-31 18:57:42 +10:00
Zuhayr
f86eba984c
Merge pull request #10962 from caelaislinn/remote_emitter_fix
...
Fixes runtime in remote emitter activation button
2015-08-31 17:25:57 +09:30
Cael Aislinn
9f1407c196
fixes runtime in remote emitter activation button
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2015-08-31 17:45:20 +10:00
Zuhayr
ac04bdfb52
Readded monkey scooping.
...
Conflicts:
code/modules/mob/living/carbon/human/species/species.dm
2015-08-31 07:01:56 +09:30
Chinsky
bfa54052f8
Merge pull request #10891 from Peliia/Peliia-patch-1
...
Virology Tiny Fixes
2015-08-29 23:27:15 +03:00
PsiOmega
22262507b9
Only living mobs now trigger shrapnel.
...
Fixes issue with manually moving ghosts would step on shrapnel, with glass noise and all.
On dev this issue is expanded further as all known movements means use forceMove.
2015-08-29 10:03:58 +02:00
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
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
Chinsky
c642e8c729
Merge pull request #10907 from PsiOmegaDelta/150827-AdminLogs
...
Improved admin logging.
2015-08-28 10:32:35 +03: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
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
