Cheridan
ce3dca998b
Adds hidable backpack
2014-09-27 19:26:44 -05:00
Cheridan
0f5fd59c0c
Merge pull request #4919 from Miauw62/tatorbalance
...
Rebalances traitor items.
2014-09-27 17:13:50 -05:00
Swag McYolosteinen
d9ee81bb96
Merge pull request #4815 from phil235/AudibleMsgFix
...
Simplifying audible messages
2014-09-27 15:01:56 +02:00
Cheridan
c35640b674
Merge pull request #4832 from Anonus/10waystowin
...
Buffs Lings
2014-09-26 19:53:23 -05:00
Remie Richards
cc85f44ccb
Merge pull request #4900 from MrStonedOne/erroageinjudgement
...
Fixes some "erros" in the database system
2014-09-26 23:41:37 +01:00
Cheridan
7d5fd4d24c
Merge pull request #4935 from Ikarrus/distressing_alert
...
New sound for more distressing minor announcements
2014-09-25 12:34:59 -05:00
phil235
1840d72ae4
reverting to show_message proc in three places.
2014-09-25 19:14:51 +02:00
phil235
3248e23887
Merge branch 'master' of https://github.com/tgstation/-tg-station into AudibleMsgFix
...
Conflicts:
code/modules/recycling/disposal.dm
2014-09-25 18:45:53 +02:00
phil235
7afbd3345b
Replacing some hearers(...) with get_hearers_in_view(...).
...
Renaming Make Sound to Object Say.
Switching deaf_message in audible_message proc to last argument.
Replacing some "for(mob in hearers)+show_message" with audible_message()
2014-09-25 18:22:27 +02:00
ikarrus
796e540dfc
Merge branch 'master' of https://github.com/tgstation/-tg-station into ammunitionlocker
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-09-25 09:37:54 -06:00
Cheridan
013a1b1a3f
Merge pull request #4918 from Aranclanos/eletropack
...
Adds the eletropack to the radio controller objects, so they work again.
2014-09-25 08:52:00 -05:00
Cheridan
42fb63b943
Merge pull request #4930 from Ikarrus/removerestrictions
...
Removes a couple of restrictions on job management
2014-09-25 08:34:59 -05:00
Cheridan
71fdb766fe
Merge pull request #4921 from phil235/OddyStatFix
...
Sleeper and odysseus fixes
2014-09-25 08:30:51 -05:00
Cheridan
65b35c53cd
Merge pull request #4954 from Aranclanos/medbotfix
...
Makes medbots less spammy
2014-09-24 21:11:52 -05:00
Cheridan
02d3cdc199
Merge pull request #4938 from hornygranny/tableclimbing
...
table bugfixes
2014-09-24 19:09:26 -05:00
Hornygranny
24edf9f6d4
Fixes #4933 by refactoring climbing (ty MrPerson)
2014-09-24 12:31:24 -07:00
Cheridan
88d26ee22d
Merge pull request #4957 from Jordie0608/adeclownerwouldbemoreinterestingtbh
...
Corrects decloner beam name
2014-09-24 10:25:45 -05:00
Swag McYolosteinen
9409ab2b65
Merge pull request #4932 from Ikarrus/tdomereset
...
[MAP] Adds a reset button for the Thunderdome
2014-09-24 17:14:51 +02:00
Ikarrus
0df3819664
logs will show if mobs have been deleted
2014-09-24 09:05:24 -06:00
Swag McYolosteinen
a278248597
Merge pull request #4955 from Aranclanos/MCcrash
...
Fixes the MC crash at using security camera computers.
2014-09-24 17:04:33 +02:00
Swag McYolosteinen
75c8cfc601
Merge pull request #4931 from Ikarrus/approvalrating
...
Fixes the "Command's Approval Rating" stat in rev end-round reports
2014-09-24 17:01:34 +02:00
Swag McYolosteinen
f9e17faca3
Merge pull request #4889 from Jordie0608/orwecouldpathplasmasheetsasfire
...
Repaths clown ore to bananium
2014-09-24 16:58:23 +02:00
Swag McYolosteinen
78ce564314
Merge pull request #4871 from phil235/FlashPowderthing
...
Fixes #4176
2014-09-24 16:55:49 +02:00
Remie Richards
4bcc59fefa
Merge pull request #4915 from Menshin/ore_machine_sheets_fix
...
Ore machine emptying stacks fix
2014-09-24 12:06:05 +01:00
Remie Richards
a9d609bc9b
Merge pull request #4802 from Menshin/stacks_merging_cleaning
...
Crafted stacks merging cleaning
2014-09-24 12:04:07 +01:00
Remie Richards
90f3b05568
Merge pull request #4724 from Lo6a4evskiy/Security_HUD_records
...
Integrated more of security records functionality into SecHUD
2014-09-24 12:02:52 +01:00
Remie Richards
3bf3386a47
Merge pull request #4846 from Incoming5643/revheadscaling
...
Changes to Revolution Mode
2014-09-24 12:00:56 +01:00
Remie Richards
1d23f24266
Merge pull request #4939 from hornygranny/passtable
...
aliens can run over tables
2014-09-23 23:00:49 +01:00
Remie Richards
2fd86d53c3
Merge pull request #4916 from Aranclanos/cargocompooter
...
Cargo shuttle getting stuck with 'invalid request' bugfix.
2014-09-23 22:59:35 +01:00
Remie Richards
1fd6f72f8e
Merge pull request #4923 from Menshin/active_diseases_cleaning
...
active_diseases list cleans up on disease cure
2014-09-23 22:54:57 +01:00
Miauw
206480744a
brings emag back down to 6 tc
2014-09-23 20:05:12 +02:00
Hornygranny
8aa5fd2ff6
ishuman changed to istype for previously defined scope
2014-09-23 10:43:26 -07:00
Jordie0608
b585ddbed8
Corrects decloner beam name
2014-09-24 00:24:22 +10:00
Cheridan
e42bcbcbf8
Merge pull request #4803 from Incoming5643/summonbadmins
...
Allows wizard events to be forced outside of summon events
2014-09-23 09:23:32 -05:00
Cheridan
b78c2ebb6f
Merge pull request #4925 from phil235/SurgeryFix
...
Surgery fixes
2014-09-23 09:11:52 -05:00
Cheridan
ff5ec967eb
Merge pull request #4917 from Jordie0608/plastiqueisoldfrechforplasticexplosives
...
Standardizes name and path of plastique/plastic explosive/c4 to C4
2014-09-23 09:02:43 -05:00
Aranclanos
e072ee9935
Fixes the MC crash at using security camera computers.
2014-09-23 10:36:11 -03:00
Cheridan
6a290e00e2
Merge pull request #4880 from Jordie0608/whatifwehadplasmagirderstoo
...
Fixes #4876 Subtype of welders not igniting plasma structures
2014-09-23 08:10:56 -05:00
Aranclanos
95b9754f01
Merge pull request #4507 from RemieRichards/AntagBeforeJobs
...
Antag selection before Job selection
2014-09-23 08:13:39 -03:00
Aranclanos
4a5440f8c3
Makes medbots less spammy, now they'll only send one message, with a cooldown of 30 seconds.
2014-09-23 06:20:49 -03:00
Aranclanos
289bfd520b
Merge pull request #4924 from Ikarrus/latejoinantagfix
...
Fixed Latejoin Antags
2014-09-23 04:54:12 -03:00
Anonus
3851bd885e
Fixes bug remie pointed out
2014-09-22 22:08:34 -04:00
Swag McYolosteinen
9fc6fccf17
Merge pull request #4616 from Ikarrus/revvsrev
...
Gang Mode for TG
2014-09-22 20:28:47 +02:00
Miauw
be939d4bc1
Adds Syndicate surplus crates, containing 50 TC of random items.
2014-09-22 20:16:59 +02:00
Miauw
619b7beede
Syndie bundle adjustments. Made the emag one TC more expensive.
2014-09-22 18:37:27 +02:00
Remie Richards
620783f734
Merge pull request #4912 from phil235/MedbotRuntimeFix
...
Fixes medbot injection runtime error
2014-09-22 17:19:45 +01:00
Remie Richards
ab35cd2b2c
Merge pull request #4909 from Miauw62/ninjacangosuckadick
...
Fixes voice changers.
2014-09-22 17:19:13 +01:00
Ikarrus
b3e9069215
Update gang.dm
2014-09-22 10:13:28 -06:00
Hornygranny
2da1e55120
aliens can run over tables
2014-09-21 22:44:57 -07:00
Hornygranny
4176e6d106
only humans can climb
2014-09-21 21:58:30 -07:00