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
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
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
duncathan salt
15ae23b74f
Merge pull request #13257 from Jordie0608/allthevarsthatdontgeteditedbecomeverylonely
...
Adds on_varedit proc
2015-12-08 11:43:14 -06:00
duncathan salt
0472592b97
Merge pull request #13327 from KorPhaeron/reactive
...
check_shields() refactor
2015-12-07 19:58:17 -06:00
duncathan salt
9ec6e187a4
Merge pull request #13464 from Anonus/hostileconstructs
...
Spawnable hostile constructs, for away missions and adminfuckery
2015-12-06 17:25:53 -06:00
duncathan
c199f0d562
cleans up gas_mixture.dm further
2015-12-06 14:36:28 -06:00
Razharas
02fe4ec5a8
Merge pull request #13443 from MrStonedOne/DONTWAIT-IKNOWWHATYOURTHINKING-YOUDONTNEEDMYRETURN-DONTWAITCAUSEISLEEP
...
changes `spawn() throw_at` to `throw_at_fast set waitfor = 0`
2015-12-06 19:52:06 +03:00
MrStonedOne
9fa4288b08
Makes everything that used spawn () throw_at use throw_at_fast
2015-12-05 16:40:52 -08:00
Nerd Lord
58a3f742c6
Spawnable hostile constructs, for away missions and adminfuckery.
2015-12-05 10:48:52 -05:00
duncathan
5f56c4a2fa
fixes the most obvious issues with gas_mixture.dm
...
highlights procs that I want dead... next commit hopefully
2015-12-04 23:09:05 -06:00
Aranclanos
249a43bb08
Merge pull request #13399 from tgstation/duncathan-patch-1
...
removes unused gas mixture code
2015-12-04 21:05:35 -03:00
Remie Richards
00bfe18348
Merge branch 'master' of https://github.com/tgstation/-tg-station into Synths
...
Conflicts:
icons/mob/human.dmi
2015-12-04 20:23:32 +00:00
Remie Richards
7469ed2263
Merge pull request #13403 from Anonus/mmnerf
...
Magic missile no longer does damage
2015-12-04 15:57:37 +00:00
paprka
717b857401
Merge branch 'BeamVines' of https://github.com/RemieRichards/-tg-station into remiepls
...
Conflicts:
code/datums/beam.dm
icons/mob/animal.dmi
tgstation.dme
2015-12-03 23:20:12 -08:00
duncathan salt
8b1ef6a768
I was right; there was no way
2015-12-03 09:08:55 -06:00
duncathan salt
8b74e975b5
there's no way that share() isn't called, is there?
2015-12-02 17:39:09 -06:00
duncathan salt
70d801639d
Actually removes some of the procs
2015-12-02 17:33:32 -06:00
Nerd Lord
1c0c1ddf60
Magic missile no longer does damage.
2015-12-02 18:08:24 -05:00
duncathan salt
0177eafe78
removes unused gas mixture code, pass 1
2015-12-02 15:17:03 -06:00
KorPhaeron
fab3cdc3a2
Cleans up copypaste, adds missing block chances
2015-11-30 16:39:02 -06:00
KorPhaeron
2609adb29d
Blocking overhaul
2015-11-30 16:22:31 -06:00
Razharas
b72eb05c28
Merge pull request #13314 from AnturK/teleportfix
...
Fixes Teleport spell
2015-11-30 10:53:52 +03:00
Remie Richards
edfb957bd2
Merge pull request #13088 from as334/master
...
Plasmamen fixes
2015-11-29 19:17:11 +00:00
as334
dc98e67f05
Just fuck my shit up fam
2015-11-29 13:48:58 -05:00
duncathan salt
a4151bb212
Merge pull request #13280 from Anonus/mmbuff
...
Fixes inflict_handler spells not doing burn damage in some cases
2015-11-29 12:36:18 -06:00
AnturK
024f635aa9
Fixes Teleport spell
2015-11-29 14:33:40 +01:00
Jordie
38eddb1421
Merge pull request #13179 from AnturK/academy
...
Wizard Academy Away Update
2015-11-29 21:06:34 +11:00
Jordie
7b1a92885c
Merge pull request #13024 from TheNightingale/Nighting
...
Elite Syndicate Hardsuit
2015-11-29 21:05:36 +11:00
as334
611fb49c1c
Wake me up inside
2015-11-29 00:58:30 -05:00
Nerd Lord
e9bbebfd36
Fixes inflict_handler spells not doing burn damage if brute damage was 0.
2015-11-28 11:42:38 -05:00
AnturK
b14e9133d2
Academy Update
2015-11-28 12:35:41 +01:00
AnturK
9fd9e5c21d
Makes user explicit in spell code
2015-11-28 12:35:40 +01:00
Remie Richards
efd06ba92f
Merge pull request #13165 from Menshin/login_runtimes_fix
...
Fixes login runtimes for round start observers
2015-11-27 20:14:49 +00:00
Remie Richards
4079e1bb7f
Merge pull request #13158 from KorPhaeron/Nya
...
Removes references to "valid" from purrbation
2015-11-27 20:01:17 +00:00
Jordie0608
5a166f6c71
change to datum proc
2015-11-27 18:26:48 +11:00
as334
ce9ea0ca46
FUCK THIS FUCK EVERYTHING
2015-11-26 22:22:07 -05:00
AnturK
e36853d7c9
Convert bots to simple animals - Updated 7.0
2015-11-26 22:06:07 +01:00
Razharas
955406bc55
Merge pull request #13216 from tkdrg/why
...
Fixes VV not updating properly for non-datums
2015-11-26 23:36:39 +03:00
YotaXP
9fe9c2faa4
Remove side effects from Character Setup
2015-11-25 18:06:05 -05:00
Tkdrg
f7c4ac2d9d
Fixes VV not updating properly for non-datums
...
Fixes #13211
2015-11-25 16:35:59 -03:00
Cheridan
67da7b7117
Merge pull request #13085 from Incoming5643/I_only_get_like_one_controversal_pull_a_year_I_better_make_this_count
...
A number of nerfs and buffs to stunning spells
2015-11-25 11:13:09 -06:00
KorPhaeron
4d3046e5cb
Terrible pun
2015-11-25 08:42:21 -06:00
phil235
34a3dcba9f
Merge pull request #12879 from MrStonedOne/burnbabyburn
...
Tweaks burn rate such that fires last longer but bombs are weaker.
2015-11-25 14:10:50 +01:00
