duncathan
b18cb5fca8
making shit compile
2015-12-28 08:31:20 -06:00
LanCartwright
b4c9dc60eb
Update martial.dm
2015-12-28 13:59:07 +00:00
tkdrg
8e53597bea
Merge pull request #14081 from tgstation/RemieRichards-FREE_PERFORMANCE
...
ATMOS SPEED ZOOM ZOOM WEEE Optimises two loops that Dunc missed.
2015-12-28 00:58:29 -03:00
Akke
1135a271f5
nothing works here
2015-12-28 03:46:27 +00:00
duncathan
108719015d
preliminary optimizations to listmos
2015-12-27 21:11:45 -06:00
LanCartwright
c20c8c0359
Update tuberculosis.dm
2015-12-28 02:20:19 +00:00
duncathan
fd65c9a6fd
removes commented code
2015-12-27 20:19:35 -06:00
Akke
84c2ae3678
now now I'm drunkl
2015-12-28 02:18:50 +00:00
duncathan
12eeef552b
small fixes
2015-12-27 20:13:44 -06:00
Akke
ba02c80bdf
better be gpd da,m gicco at thos [pomt
2015-12-28 01:33:59 +00:00
duncathan
bf6a7b6741
updates gas_mixture.dm
...
the list is now used everywhere
updates logic of certain procs to reduce copypaste
no compile errors remain in this file
2015-12-27 17:58:50 -06:00
duncathan
ef5d1f8cf2
initial listmos commit
...
most of gas mixtures have been changed to work with the list
nothing else has so this doesn't compile yet
2015-12-27 16:02:17 -06:00
tkdrg
50bcb521f5
Merge pull request #14056 from neersighted/nano_tweaks
...
Nano Tweaks
2015-12-27 14:20:52 -03:00
Bjorn Neergaard
a173cc01f6
Fix NanoUIs not transfering when the owner ghosts (or reenters)
2015-12-27 10:56:48 -06:00
MrStonedOne
5f68bedcd1
Upgrades do_after and progress bars
2015-12-26 21:04:19 -08:00
Remie Richards
0bffdb4c08
Optimises two loops that Dunc missed.
2015-12-27 03:39:43 +00:00
MrStonedOne
c33e97afb5
Ghost popup re-work
...
Part 1, the main frame work.
2015-12-26 14:45:15 -08:00
tkdrg
7ab1cc2968
Merge pull request #14046 from Anonus/whytalyn
...
Fixes retrovirus referring to ryetalyn as a possible cure
2015-12-26 17:06:28 -03:00
Nerd Lord
f083948ecb
Fixes retrovirus referring to ryetalyn where mutadone replaced it.
2015-12-25 12:22:25 -05:00
tkdrg
2faa68861e
Merge pull request #13973 from tgstation/RemieRichards-cancel-targetted-spells
...
Allows you to cancel Targeted spells.
2015-12-24 23:01:34 -03:00
Akke
9550bf20bc
js first code
2015-12-24 17:54:08 +00:00
Akke
6179b85711
thanks tkrg
2015-12-24 17:45:13 +00:00
Akke
a8faf3e4e7
i think this should do it
2015-12-24 17:18:07 +00:00
as334
bf7b1ad085
Adds more sanity checks to Fusion, and a temperature check to react. Hopefully no more negative temperatures ever again.
2015-12-23 17:22:05 -05:00
Remie Richards
e2ea3b6c4c
Allows you to cancel Targetted spells.
2015-12-23 22:13:43 +00:00
Lularian
f77ac2a14e
tactical gear
2015-12-22 13:59:02 -06:00
duncathan salt
2471c5e31d
Merge pull request #13864 from as334/plasmic
...
Fixes fusion
2015-12-22 18:23:14 +01:00
Akke
c0ef8696e0
Adds help functions to learning and forgetting fighting styles
2015-12-21 23:08:35 +00:00
Akke
61ae415ae0
fixes missing "
2015-12-21 12:38:40 +00:00
Akke
161e6ea5c1
Merge branch 'plasmaknucklesandwich' of https://github.com/LanCartwright/-tg-station into plasmaknucklesandwich
2015-12-21 12:32:04 +00:00
Akke
9bb1585b59
adds wrestling data
2015-12-21 12:31:30 +00:00
KorPhaeron
7200c74d90
Fixes various ghost replacement things
2015-12-21 02:43:42 -06:00
tkdrg
9fe6d2bfce
Merge pull request #13827 from The-Albinobigfoot/master
...
Flops can buy no-slips again.
2015-12-21 01:29:38 -03:00
tkdrg
c00e773b6d
Merge pull request #13818 from LanCartwright/nukeopsrenovation
...
NukeOps gun renovation with bundles
2015-12-20 21:59:17 -03:00
LanCartwright
ba18bebf48
missed this one
2015-12-21 00:40:20 +00:00
Akke
7d5f21259d
Changes c90gl to m90gl
2015-12-21 00:30:55 +00:00
as334
2c9dd75137
Across the board nerfs for plasmic fusion, as well as hopefully fixing the transfer bugs.
2015-12-20 19:18:19 -05:00
LanCartwright
39e7e7f5ba
Update martial.dm
2015-12-21 00:12:36 +00:00
tkdrg
52d66c40a7
Merge pull request #13803 from KorPhaeron/sproink
...
Accelerator Rounds for sniper rifle
2015-12-20 20:58:21 -03:00
Akke
da324e7661
nyet cyka russian mumbles
2015-12-20 23:25:06 +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
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
The-Albinobigfoot
0e738e34b9
A Modest Proposal.
2015-12-20 11:03:31 -08:00
Cheridan
dc5cb310d7
Merge pull request #13807 from KorPhaeron/cloak_of_shadows
...
Removes cloak of shadows
2015-12-20 10:56:27 -06:00
tkdrg
f85ee6f1b0
Merge pull request #13820 from LanCartwright/newchemsmoke
...
Adds Bioterror foam grenades V2
2015-12-20 04:13:29 -03:00
The-Albinobigfoot
0992db8410
Flops can buy no-slips again.
...
I mean, seriously fam?
🆑
rscadd: The Syndicate recognizes that interfering with shipments of ultra-adhesive shoe wear in the name of galactic "balance" was a touch sadistic - Nuclear Operative families may now once again requisition no-slips.
/🆑
2015-12-19 20:41:31 -08:00
LanCartwright
29ffdd90aa
reverts mauler to previous price.
2015-12-20 00:16:53 +00:00
Akke
16f09a0bf8
bioterror grenades
2015-12-20 00:14:17 +00:00
LanCartwright
85c4f46792
Update uplink_item.dm
2015-12-19 23:01:12 +00:00
