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
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
duncathan salt
2471c5e31d
Merge pull request #13864 from as334/plasmic
...
Fixes fusion
2015-12-22 18:23:14 +01: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
tkdrg
52d66c40a7
Merge pull request #13803 from KorPhaeron/sproink
...
Accelerator Rounds for sniper rifle
2015-12-20 20:58:21 -03: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
Akke
3818c227d2
For a 60 crew round, this theoretically allows all operatives to own a gun and some ammo, and still have some points left over for luxuries.
...
This mainly balances gun prices and adds new bundles
2015-12-19 22:44:49 +00:00
AndrewJacksonThe2nd
1ab5e80458
Tesla map removal to fix merge
2015-12-19 12:32:50 -08:00
KorPhaeron
c7018ff580
Removes cloak of shadows
2015-12-19 08:04:43 -06:00
KorPhaeron
99eef199f8
accelerator fixed for real this time
2015-12-19 07:18:00 -06:00
KorPhaeron
493e7423f4
accelerator fix
2015-12-19 07:16:20 -06:00
KorPhaeron
e9903e086d
Accelerator Rounds
2015-12-19 07:15:21 -06:00
tkdrg
4adb440940
Merge pull request #13758 from KorPhaeron/deepstrike2
...
Gives the nuke ops an assault pod in place of their teleporter
2015-12-19 01:03:39 -03:00
tkdrg
a7ccd084e8
Merge pull request #13734 from KorPhaeron/reinforcements
...
Allows nuke ops to purchase reinforcements
2015-12-18 21:47:01 -03:00
KorPhaeron
20daeabf9e
Proper refunds
2015-12-18 18:26:44 -06:00
KorPhaeron
c3195d19d4
Refunds
2015-12-18 18:10:26 -06:00
Cheridan
dd547f8b7a
Merge pull request #13643 from CPTANT/Robocop
...
changes robocop law priority
2015-12-18 17:48:21 -06:00
KorPhaeron
86a983d361
OOP
2015-12-18 17:42:49 -06:00
MMMiracles
ef2ac1b0c8
CONflicts
2015-12-18 16:34:06 -05:00
Tkdrg
97e4058fc2
Fixes runtime when VVing datums
...
I'm dumb.
2015-12-18 16:55:44 -03:00
tkdrg
84d26ecc4d
Merge pull request #13730 from KorPhaeron/boss_get_down_a_sniper
...
Penetrator rounds for sniper rifles
2015-12-18 15:43:29 -03:00
tkdrg
b92224b95b
Merge pull request #13728 from KorPhaeron/burning_singulo
...
Lava proofing
2015-12-18 03:49:55 -03:00
KorPhaeron
57d29d11d4
Replaces malf with traitor AI
2015-12-18 00:05:30 -06:00
KorPhaeron
8de9b99182
Deepstrike 2
2015-12-17 23:22:37 -06:00
MMMiracles
6c2731b22b
conflicts are dumb tbh
2015-12-17 21:17:06 -05:00
MMMiracles
ba5bc90d75
just gonna not
2015-12-17 21:11:06 -05:00
tkdrg
c342c28e2f
Merge pull request #13703 from neersighted/nano_reduction
...
NanoUI Reduction
2015-12-17 15:07:45 -03:00
Razharas
3dccbbc87a
Merge pull request #13658 from tkdrg/jamp
...
Adds a Follow/Jump to link to the VV dropdown
2015-12-17 20:53:19 +03:00
Bjorn Neergaard
332cc5af71
Re-organize NanoUI procs
2015-12-17 10:18:00 -06:00
KorPhaeron
726bea04f0
25 tc
2015-12-17 06:56:39 -06:00
KorPhaeron
c2bc05a799
Reinforcements for nuke ops
2015-12-17 06:54:21 -06:00
KorPhaeron
df74fae945
Penetrator rounds
2015-12-17 02:05:34 -06:00
KorPhaeron
d564e1e2f3
Lava proofing
2015-12-17 01:48:11 -06:00
Tkdrg
abb0cd663c
Adds a Follow/Jump to link to the VV dropdown
...
Some good QoL for debugging stuff.
2015-12-17 00:45:16 -03:00
KorPhaeron
a5fb122f49
The Mulligan
...
A syringe which completely randomizes your name and appearance.
Traitor only, and in the spy bundle.
2015-12-17 00:14:18 -03:00
