Commit Graph

2033 Commits

Author SHA1 Message Date
AndrewJacksonThe2nd
1ab5e80458 Tesla map removal to fix merge 2015-12-19 12:32:50 -08: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
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
KorPhaeron
9e22d7be4e Shielded hardsuits 2015-12-16 19:57:52 -06:00
MMMiracles
cc7ac6c518 exo grip is rip, final changes. 2015-12-16 20:14:23 -05:00
oranges
134a76cc8f Line ending apocalypse 2015-12-17 14:12:37 +13:00
tkdrg
a996b056e6 Merge pull request #13525 from KorPhaeron/chest_high_walls
More sec barricade changes/general cover changes
2015-12-16 20:39:37 -03:00
Cheridan
840eb5beb1 Merge pull request #13672 from KorPhaeron/hulk_buff
Hulks now lose hulk on crit
2015-12-16 13:46:14 -06:00
Jordie
2f457588ef Merge pull request #13573 from AnturK/medgun
Adds Med Beam Gun
2015-12-16 21:48:10 +11:00
tkdrg
a2aee48ece Merge pull request #13609 from AnturK/runtimes
Fixes for few runtime errors
2015-12-16 04:15:21 -03:00
Razharas
a349a15469 Merge pull request #13552 from tkdrg/newnewnewnewnewnewnewnewnewnewcult
[Ready?] Cult Overhaul. Yep.
2015-12-16 06:07:20 +03:00
KorPhaeron
eb18ab59e6 Hulk 2015-12-15 11:25:39 -06:00
Tkdrg
8ead3e8628 Cult Overhaul
Cult is awful, so let's try to improve it. Idea by KorPhaeron. I also
took some inspiration from adrix89's sacrifice cult, so credits to him.
Also thanks a lot specially to MrPerson and Iamgoofball for helping
me brainstorm this, and Joan for the sprites for the summoning orb,
the large nar-sie shell, and the new cult antag hud.

Basically, we remove conversion, and turn cult into a magic version of
nuke, with a small team of stealth elite cultists that have to build a
base in the station and sacrifice people in order to build an army of
constructs and get materials to eventually summon Nar-Sie.

Stun talismans and conversion are gone. Nar-Sie is now the only
objective. Sacrifice runes now provide summoning orbs, which you can use
to drop a large shell. Insert enough orbs in the shell and you trigger a
Delta. Defend the shell for 3 minutes and Nar-sie will arise. This shell
is bombproof and singularityproof. It may be summoned up to three times
if destroyed, but you will have to start from the beginning sac-wise.

Runes are now RNG. Each cultist only gets 50% of the runes. Inspiration
is basically The Binding of Isaac here (thank you MrPerson for this!).
Furthermore, many old runes were merged/removed and other new ones were
added. Almost all were massively rebalanced. Cult now also has a
stealthy ritual dagger with high bleeding and throw effects.
2015-12-15 04:59:31 -03:00
MMMiracles
7145fd6cf2 incen shots, attempt at some sort of exo-grip attachment please help 2015-12-14 23:37:18 -05:00
as334
bd8cc251b7 For dunc 2015-12-14 19:52:58 -05:00
as334
32e68cfab0 Hopefully fixes the negative moles/heat bugs with fusion, as well as it being a bit overactive in fires. 2015-12-14 19:24:46 -05:00
MMMiracles
72af408f19 see-saw 2015-12-14 18:28:52 -05:00
CPTANT
20c6659c4a changes robocop law priority 2015-12-14 17:28:36 +01:00
MMMiracles
6aac2874ac good 2015-12-13 23:05:46 -05:00
duncathan salt
08a62ec85f Merge pull request #13593 from as334/plasmic
Adds a new gas reaction, plasmic fusion.
2015-12-13 13:46:33 -06:00
AnturK
2c9adb12f3 Fixes spell logging runtime
Fixes lava runtime
Fixes mecha ore scanner runtime
Fixes crayon writing runtime
Fixes latejoin headrev runtime
2015-12-13 15:04:12 +01:00
Cheridan
dff14aa0f9 Merge pull request #13563 from RemieRichards/snipper_wiffle
Adds a sniper rifle and 3 ammo types to the Nuclear Operative uplink.
2015-12-12 23:55:55 -06:00
Aranclanos
e016275408 Merge pull request #13459 from duncathan/ohgodimdoingitimactuallytouchinggascode
Small cleanup of gas_mixture.dm
2015-12-12 19:29:08 -03:00
as334
80f4b0b1b0 Fixes my numerous errors(you saw nothing) 2015-12-12 15:07:42 -05:00
as334
8f2d65c446 Adds a new gas reaction, plasmic fusion. 2015-12-12 12:32:28 -05:00
AnturK
ec85d5ceec Fixes beam crossing
Adds Medbeam gun to Nukeop Uplink
Adds Medbeam gun to ERT medic equipment
2015-12-12 12:26:37 +01:00
Razharas
7929c027fa Merge pull request #13550 from Incoming5643/new_wizard_meta_just_look_for_the_people_who_arent_fucked_up
Apprentice clean up / bugfixes
2015-12-11 22:50:46 +03:00
Remie Richards
bc561789c2 Adds a sniper rifle and 3 ammo types to the Nuclear Operative uplink. 2015-12-11 01:30:14 +00:00
Incoming
6a64864805 formally defines apprentices as a kind of antag instead of as "traitors".
Wizard events that spare the wizard should now properly spare apprentices too.

Moves renaming as an apprentice to the end of the spawn proc because the input prompt stops various important things (including the sound meant to inform people they got apprentice) from happening until after it's dealt with.

Restores the "+" for positive quality items in RPG loot. The reason this was changed was already fixed, it just was mistakenly never put back.
2015-12-10 12:08:49 -05:00
Cheridan
5004bcdba2 Merge pull request #13122 from RemieRichards/Synths
Adds a Synth Species
2015-12-09 20:11:09 -06:00