duncathan
8392974ad0
fixes associative list; adds gas_overlay to "datum gases"
2015-12-29 22:50:09 -06:00
duncathan
17f167bcb7
associative list
2015-12-29 13:33:12 -06:00
duncathan
cc9c5768ca
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
...
Conflicts:
code/datums/gas_mixture.dm
2015-12-28 13:59:16 -06:00
duncathan
a64b68f76c
caches gases in more procs
2015-12-28 13:32:49 -06:00
tkdrg
e88bf4e2b5
Merge pull request #14084 from MrStonedOne/GOOOOOF
...
Upgrades do_after and progress bars.
2015-12-28 14:35:34 -03:00
duncathan
b18cb5fca8
making shit compile
2015-12-28 08:31:20 -06:00
MrStonedOne
5f68bedcd1
Upgrades do_after and progress bars
2015-12-26 21:04:19 -08:00
bawhoppen
ca272c4980
tweaks size
2015-12-26 21:54:03 -06:00
Lularian
f880b3edb5
fire in the hole
2015-12-26 13:23:59 -06:00
tkdrg
c4e7e31c92
Merge pull request #14032 from KorPhaeron/chainsaw
...
Fixes chainsaw surgery
2015-12-26 04:43:09 -03:00
tkdrg
d4cc57041b
Merge pull request #14029 from PKPenguin321/patch-6
...
Fixes some EZ issues
2015-12-26 04:42:51 -03:00
tkdrg
7b2cd63474
Merge pull request #14022 from Incoming5643/please_don't_merge_unfinished_prs
...
Command headsets being really loud is now a physical toggle
2015-12-25 22:41:47 -03:00
Incoming5643
4fab87989b
Removes href value dependency
2015-12-25 19:34:25 -05:00
tkdrg
0a4b99e2ec
Merge pull request #13985 from bgobandit/bugfixesandshit
...
Fixes some minor bugs and adds minor feedback.
2015-12-25 18:24:25 -03:00
KorPhaeron
85ac583708
Fixes chainsaw surgery
2015-12-24 21:51:01 -06:00
PKPenguin321
b1d1f7753e
fixes santabag/suicide_act
...
fixes the path for santabag/suicide_act
2015-12-24 19:30:21 -08:00
tkdrg
130a4e0242
Merge pull request #13877 from LanCartwright/thesethingsdontgrowontreesyouknow
...
Removes Bulldogs from roundstart syndicate ship
2015-12-24 22:21:55 -03:00
LanCartwright
019f460dc9
Update uplinks.dm
2015-12-25 01:15:49 +00:00
Akke
c7d91019ec
final revision
2015-12-25 01:02:29 +00:00
Incoming
f2cfda71f1
Command headset's being really loud is now a physical toggle on relevant headsets that starts off.
...
The span change for this mode is now just bolding, as what matters is the text looks different, as to stand out in the sea of green. It DOESN'T need to be as big as an attack message.
2015-12-24 19:37:10 -05:00
Akke
db23604952
adds 10 more tc to op uplink for total of 30
2015-12-24 18:56:36 +00:00
tkdrg
75fe5b095c
Merge pull request #13961 from MrStonedOne/patch-101
...
freeform law boards no longer silently return when entering invalid law number, but rather ask if the user would like to change it to 15
2015-12-24 14:18:23 -03:00
bgobandit
789e3457cb
fixes some minor bugs
2015-12-24 04:35:08 -05:00
tkdrg
fbe8c02ed1
Merge pull request #13915 from KorPhaeron/command_headset
...
Using command headsets makes you have larger radio speech
2015-12-23 17:00:01 -03:00
tkdrg
4532f90aa7
Merge pull request #13906 from KorPhaeron/typo_fix
...
Fixes energy axe typo
2015-12-23 14:46:33 -03:00
Kyle Spier-Swenson
671388ca2b
freeform law boards are now easier to use
...
I default the input to 15, and ask them if they want to set it to 15 if they enter in an invalid number, rather than silently return
2015-12-23 03:47:03 -08:00
tkdrg
434598b0e4
Merge pull request #13853 from KorPhaeron/NOSHIELD
...
Removes NOSHIELD flag, gives NOSHIELD items armour penetration
2015-12-23 03:17:01 -03:00
KorPhaeron
66ed7605d7
Command Headsets
2015-12-22 09:36:10 -06:00
KorPhaeron
3704b1f7ce
Typo
2015-12-22 05:38:43 -06:00
tkdrg
d8cd0638d8
Merge pull request #13823 from Xhuis/misc_fixes
...
Stun batons respect shields on hit
2015-12-21 19:43:12 -03:00
tkdrg
bbe96caee1
Merge pull request #13785 from KorPhaeron/we_dune_now
...
Eshields have 100% block vs energy ,but 0 vs everything else
2015-12-21 19:42:52 -03:00
tkdrg
0397ce0b54
Merge pull request #13848 from AnturK/emplight
...
Fixes emp flashlight firing when storing it
2015-12-21 18:33:03 -03:00
Cheridan
b7c0d8cbb3
Merge pull request #13836 from KorPhaeron/mounted_chainsaws
...
Fixes mounted chainsaw deletion
2015-12-21 09:18:16 -06:00
tkdrg
c00e773b6d
Merge pull request #13818 from LanCartwright/nukeopsrenovation
...
NukeOps gun renovation with bundles
2015-12-20 21:59:17 -03:00
Akke
7d5f21259d
Changes c90gl to m90gl
2015-12-21 00:30:55 +00:00
tkdrg
c5106537ef
Merge pull request #13801 from bgobandit/hohohogod
...
Adds Christmas-related suicide messages.
2015-12-20 20:49:32 -03:00
KorPhaeron
a0923daa0e
Removes NOSHIELD
2015-12-20 15:21:58 -06:00
LanCartwright
b8bdc8fce3
merge error
2015-12-20 21:04:54 +00:00
LanCartwright
986bfc8501
merge error
2015-12-20 21:04:09 +00:00
Akke
12206ae324
Merge branch 'nukeopsrenovation' of https://github.com/LanCartwright/-tg-station into nukeopsrenovation
...
# Conflicts:
# code/game/objects/items/weapons/storage/backpack.dm
2015-12-20 21:02:08 +00:00
Akke
060ed21b7c
adds so much more shit
2015-12-20 20:59:23 +00:00
AnturK
1a7c2a1eca
Fixes emp flashlight firing when storing it
2015-12-20 21:33:29 +01:00
Cheridan
10712f9553
Merge pull request #13804 from KorPhaeron/megaphone
...
Megaphone fix
2015-12-20 13:48:54 -06:00
tkdrg
bab0d21e5a
Merge pull request #13759 from KorPhaeron/copyofacopyofacopyofacopyofacopy
...
Merges Malf AI and traitor AI into a single antag type, no longer has its own mode
2015-12-20 16:18:37 -03:00
KorPhaeron
e336acaa33
Voice changer friendly
2015-12-20 11:51:29 -06:00
Cheridan
dc5cb310d7
Merge pull request #13807 from KorPhaeron/cloak_of_shadows
...
Removes cloak of shadows
2015-12-20 10:56:27 -06:00
KorPhaeron
00e322da3a
Fixes mounted chainsaws
2015-12-20 04:30:35 -06:00
tkdrg
f85ee6f1b0
Merge pull request #13820 from LanCartwright/newchemsmoke
...
Adds Bioterror foam grenades V2
2015-12-20 04:13:29 -03:00
tkdrg
f0735982dc
Merge pull request #13799 from KorPhaeron/admin_items
...
Fixes Grey Tide exploits
2015-12-20 03:50:13 -03:00
Xhuis
4136e49b2b
Makes stun batons respect shields upon hit
2015-12-19 22:05:35 -05:00
