Alex
3bf763f9a7
Merge pull request #4792 from Aranclanos/grabruntimes
...
Fixes two runtimes related to the grab object.
2014-09-14 13:19:04 +01:00
Alex
1431e64477
Merge pull request #4781 from Jordie0608/niknaksaystickymayhemisnotprofessionalyethetalksaboutpooping
...
Removes log_adminwarn
2014-09-14 13:14:22 +01:00
Alex
01b9f2c851
Merge pull request #4800 from rbreslow/patch-1
...
Fix span error
2014-09-14 13:13:22 +01:00
Alex
43ff5a56fe
Merge pull request #4814 from Ikarrus/handholdingspoonfeeding
...
Shuttle Call/Recall Tracing in Announcements
2014-09-14 13:13:11 +01:00
Alex
09dffeb90b
Merge pull request #4807 from Miauw62/vOv
...
Fixes ghosts not being able to hear binary.
2014-09-14 13:09:35 +01:00
Alex
a3ba933515
Merge pull request #4799 from phil235/MachineryFix
...
Multiple machinery fixes
2014-09-14 13:08:30 +01:00
Ikarrus
ce6b823f08
Update narsie.dm
2014-09-13 12:55:26 -06:00
ikarrus
9b8322c19d
Shuttle Call/Recall Tracing in Announcements
...
- Emergency shuttle call/recall announcements will say when a tracing attempt has been successful, as well as explicitly telling players how to view them
- Clarified language further on how emergency shuttle tracing is done
- Increased tracing success rate from 60% to 70%
- Removed a lot of duplicated code by moving all the priority_announce() calls to incall()
2014-09-13 12:50:38 -06:00
Miauw
6ff1e429fa
Fixes ghosts not being able to hear binary.
2014-09-13 13:50:20 +02:00
Miauw
704ed6b352
HAAAWWWW!! Fixed #4753
2014-09-13 13:33:18 +02:00
rbreslow
65f01cd1cd
Fix span error
2014-09-12 15:34:13 -04:00
phil235
d056cf1b69
Multiple machinery fixes
2014-09-12 20:39:02 +02:00
Aranclanos
eb7f3f286d
Fixes two runtimes related to the grab object.
2014-09-12 06:39:31 -03:00
Alex
36d84ebcc7
Merge pull request #4737 from Ikarrus/laborcap
...
Labor Camp Quotas
2014-09-11 19:53:43 +01:00
Alex
7ab4dcb502
Merge pull request #4779 from Jordie0608/doublethelogsdoublethefun
...
Makes show attack log only ask once
2014-09-11 19:51:43 +01:00
Cheridan
21c08ad616
Merge pull request #4771 from Aranclanos/shaddeathspam
...
Fixes the shade spam when they die.
2014-09-11 13:06:17 -05:00
Cheridan
304b89bdc0
Merge pull request #4776 from Miauw62/radiodeaf
...
Fixes "seeing" people speak over the radio while deaf.
2014-09-11 08:42:18 -05:00
Cheridan
b0ab0754e1
Merge pull request #4772 from Aranclanos/carpmeat
...
Fixes a bug where you couldn't get meat from carps and several other mobs.
2014-09-11 08:21:36 -05:00
Hornygranny
1bc6c36593
fixed typo
2014-09-11 01:55:07 -07:00
Jordie0608
a1de281338
Removes log_adminwarn
2014-09-11 17:35:28 +10:00
Jordie0608
272787615d
Makes show attack log only ask once
2014-09-11 11:39:07 +10:00
Miauw
e557cbb263
Fixes "seeing" people speak over the radio while deaf. Fixed #4768
2014-09-10 14:19:42 +02:00
Cheridan
88471ff0d6
Merge pull request #4622 from Ikarrus/hivemindpaygate
...
Hivemind Communication (:g) must be purchased before use
2014-09-10 07:09:55 -05:00
Cheridan
81611c8f1a
Merge pull request #4723 from Miauw62/now_recording_input
...
Prevents voice analyzers using their own speech as input.
2014-09-10 07:08:05 -05:00
Cheridan
9550d3e844
Merge pull request #4729 from Miauw62/corgemotes
...
Makes simple_animals able to emote again
2014-09-10 07:06:39 -05:00
Aranclanos
de35b75fad
Fixes a bug where you couldn't get meat from carps and several other mobs.
2014-09-10 07:30:31 -03:00
Aranclanos
d97d2ff85a
Fixes the shade spam when they die.
2014-09-10 07:12:59 -03:00
Cheridan
6c5f0fe355
Merge pull request #4744 from Ikarrus/lizardthugs
...
ENFORCE_HUMAN_AUTHORITY now only applies to Command positions
2014-09-09 17:30:39 -05:00
Cheridan
0a35c2c740
Merge pull request #4749 from phil235/VomitMsgFix
...
Vomit message fix
2014-09-09 17:18:07 -05:00
phil235
a4de7ac6a1
Vomit message fix
2014-09-08 22:39:07 +02:00
Hornygranny
89850cfd2b
fixed fucked spacing from resolver
2014-09-07 21:39:10 -07:00
ikarrus
399d2844e5
ENFORCE_HUMAN_AUTHORITY now only applies to Command positions
...
- Non-humans can join as security again while ENFORCE_HUMAN_AUTHORITY is on
2014-09-07 22:33:56 -06:00
Hornygranny
02e527e938
Merge branch 'smoothaliens'
...
Conflicts:
code/_onclick/hud/screen_objects.dm
code/modules/mob/living/carbon/alien/alien.dm
2014-09-07 21:33:48 -07:00
Hornygranny
2fac982191
alien nightvision moved to carbon/alien
...
random lines fixed
2014-09-07 21:16:32 -07:00
Orange Borg
0e05203e1a
Don't tell GIA
...
2fast goofball
2014-09-08 15:55:04 +12:00
Cheridan
cd34be6151
Merge pull request #4521 from Incoming5643/summonevents
...
Magic Mania $1.75: Summon events
2014-09-07 22:34:26 -05:00
Cheridan
7750a2baae
Merge pull request #4525 from GunHog/HUDS_For_All
...
Silicon Medical and Security HUDs!
2014-09-07 20:01:12 -05:00
Cheridan
866dbb7959
Merge pull request #4634 from Carn/timSort
...
TimSort for byond
2014-09-07 19:52:02 -05:00
ikarrus
20e337f8c4
Labor Camp Quotas
...
- Caps labor camp quotas at 1000 points (the equivalent of 10 minutes in the brig)
- Adds a line explaining the conversion rate between points and minutes
- Removes erroneous information that claimed zero point quotass equalled to unlimited
2014-09-07 18:42:46 -06:00
ikarrus
0e27dc6b39
Resolved Conflicts:
...
code/modules/mob/living/say.dm
2014-09-07 10:58:13 -06:00
Miauw
877bd04fa1
Makes simple_animals able to emote again??? Fixed #4669
2014-09-07 17:46:02 +02:00
Cheridan
6bde58d70d
Merge pull request #4702 from Miauw62/sleepen
...
Balance changes to the sleepy pen.
2014-09-07 10:38:00 -05:00
Alex
8f81a0e766
Merge pull request #4709 from Lo6a4evskiy/2014-08-15-Welding-stuff
...
Removed unnecessary messages when welding
2014-09-07 15:08:01 +01:00
Alex
b7aad470a0
Merge pull request #4705 from Ikarrus/humanmasterrace
...
Config Option to Bar Lizards from Authority Roles
2014-09-07 15:02:45 +01:00
Miauw
cfe2f63b19
Prevents voice analyzers using their own speech as input. Fixed #4670
2014-09-07 13:45:04 +02:00
ikarrus
4230894dec
Merge branch 'master' of https://github.com/tgstation/-tg-station into hivemindpaygate
...
Resolved Conflicts:
code/modules/mob/living/say.dm
2014-09-06 12:59:08 -06:00
Alex
574d5248d4
Merge pull request #4600 from Menshin/2Spooky5Playing
...
Fixes skeletons unable to play xylophone on their ribcage
2014-09-06 19:13:50 +01:00
Alex
9d2e1ffafd
Merge pull request #4630 from Ikarrus/nukeopsetup
...
Nuke Ops Update
2014-09-06 19:10:38 +01:00
Alex
c854ef6667
Merge pull request #4703 from Ikarrus/beepboopiamthelaw
...
Securitrons will only arrest unidentifiable persons when ID check is on
2014-09-06 19:10:07 +01:00
Alex
8fff1aa0c7
Merge pull request #4701 from phil235/goldschlagerfix
...
fixing the icon of goldschlager glass
2014-09-06 19:08:02 +01:00
