Chinsky
adf19d674b
Merge pull request #11055 from mwerezak/coffee-fix
...
Returns coffee jitteriness to an overdose effect
2015-09-11 22:49:35 +02:00
SomeoneElse
7e4191d212
[minor] Fix ATM transfer code, remove badly placed 'break'.
...
code/modules/economy/Accounts.dm:
remove break from charge_to_account()
2015-09-11 16:44:00 +06:00
mwerezak
e1e47ac189
Merge branch 'master' into coffee-fix
2015-09-11 00:54:47 -04:00
mwerezak
b9ee4ebc5e
Merge branch 'master' into abandonedcrates
2015-09-10 15:21:15 -04:00
mwerezak
67fd31bd3e
Abandoned crates now again use unique digits for their codes
2015-09-10 00:42:14 -04:00
mwerezak
19b195cd27
Revert "Reverts #10649 , fixes #10621 "
...
This reverts commit cb5df3963a
2015-09-09 21:12:24 -04:00
PsiOmegaDelta
2007004f3c
Qdel cleanup.
...
Replaces a few instances of del() with qdel().
2015-09-09 12:20:33 +02:00
mwerezak
cfa82e0c5e
Allows resisting while restrained, prevents stop-drop-and-roll while buckled.
2015-09-09 03:11:09 -04:00
mwerezak
5e478b58e8
Fixes #10746
...
Stumps can now be amputated, but not removed by taking damage.
2015-09-09 00:17:37 -04:00
PsiOmegaDelta
30069d1dce
Merge pull request #11044 from Kelenius/beepskyFixes
...
Makes beepsky less brutal
2015-09-08 10:41:30 +02:00
Kelenius
388159c7f1
Makes beepsky less brutal
...
Fixes #10979
Fixes beepsky beating up handcuffed people
2015-09-08 11:36:55 +03:00
Zuhayr
211e426009
Tweak.
2015-09-07 14:43:20 +09:30
Zuhayr
c2908bfc50
Fixes #10951
2015-09-07 14:43:12 +09:30
Zuhayr
dd81250b1b
Merge pull request #10784 from Kelenius/masterRuntimes
...
Fixes two runtimes
2015-09-07 14:01:24 +09:30
Chinsky
9533f2d154
Merge pull request #11026 from GinjaNinja32/announcement
...
Improve formatting of admin announcements
2015-09-07 01:02:36 +03:00
Chinsky
47f382b892
Merge pull request #11027 from Datraen/master
...
[BOTANY] Fixes plant nutrient storage unit check
2015-09-07 01:02:21 +03:00
Datraen
05a29f8f3a
[BOTANY] Fixes plant storage nutrient check
...
Reported only high, low or none with previous system.
2015-09-06 16:42:58 -04:00
GinjaNinja32
5a335c9140
Improve formatting of admin announcements
2015-09-06 20:41:06 +01:00
Samuel Novák
12a0bae5bd
Stop resting when pAI chassis collapses
2015-09-05 21:53:21 +02:00
GinjaNinja32
8685ff42a4
Merge pull request #11008 from Zuhayr/antaghud
...
Refactored the antagHUD to work better with the new antagonist system.
2015-09-05 17:01:57 +01:00
GinjaNinja32
ef208a55aa
Merge pull request #10996 from PsiOmegaDelta/150804-CrawlThroughThoseVents
...
Vent crawling now explicitly checks for equipped items.
2015-09-05 16:59:33 +01:00
Zuhayr
90c9d31782
Refactored the antagHUD to work better with the new antagonist system.
2015-09-05 18:51:17 +09:30
Chinsky
34662a83b5
Merge pull request #10998 from Zuhayr/antagsystem
...
Antag system fixes.
2015-09-05 07:56:42 +03:00
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
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
23fb8d8b99
Antag system cleanup/fixes.
2015-09-04 18:28:05 +09:30
PsiOmega
1f39768ce1
Vent crawling now explicitly checks for equipped items.
...
Fixes #10991 .
2015-09-04 08:09:05 +02:00
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
Chinsky
667debfb3c
Merge pull request #10745 from mwerezak/mob-grab
...
Cleans up mob_grab.dm
2015-09-01 12:58:50 +03: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
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
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
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
