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
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
5004bcdba2
Merge pull request #13122 from RemieRichards/Synths
...
Adds a Synth Species
2015-12-09 20:11:09 -06:00
15ae23b74f
Merge pull request #13257 from Jordie0608/allthevarsthatdontgeteditedbecomeverylonely
...
Adds on_varedit proc
2015-12-08 11:43:14 -06:00
0472592b97
Merge pull request #13327 from KorPhaeron/reactive
...
check_shields() refactor
2015-12-07 19:58:17 -06:00
9ec6e187a4
Merge pull request #13464 from Anonus/hostileconstructs
...
Spawnable hostile constructs, for away missions and adminfuckery
2015-12-06 17:25:53 -06:00
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
9fa4288b08
Makes everything that used spawn () throw_at use throw_at_fast
2015-12-05 16:40:52 -08:00
58a3f742c6
Spawnable hostile constructs, for away missions and adminfuckery.
2015-12-05 10:48:52 -05:00
249a43bb08
Merge pull request #13399 from tgstation/duncathan-patch-1
...
removes unused gas mixture code
2015-12-04 21:05:35 -03:00
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
7469ed2263
Merge pull request #13403 from Anonus/mmnerf
...
Magic missile no longer does damage
2015-12-04 15:57:37 +00:00
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
8b1ef6a768
I was right; there was no way
2015-12-03 09:08:55 -06:00
8b74e975b5
there's no way that share() isn't called, is there?
2015-12-02 17:39:09 -06:00
70d801639d
Actually removes some of the procs
2015-12-02 17:33:32 -06:00
1c0c1ddf60
Magic missile no longer does damage.
2015-12-02 18:08:24 -05:00
0177eafe78
removes unused gas mixture code, pass 1
2015-12-02 15:17:03 -06:00
fab3cdc3a2
Cleans up copypaste, adds missing block chances
2015-11-30 16:39:02 -06:00
2609adb29d
Blocking overhaul
2015-11-30 16:22:31 -06:00
b72eb05c28
Merge pull request #13314 from AnturK/teleportfix
...
Fixes Teleport spell
2015-11-30 10:53:52 +03:00
edfb957bd2
Merge pull request #13088 from as334/master
...
Plasmamen fixes
2015-11-29 19:17:11 +00:00
dc98e67f05
Just fuck my shit up fam
2015-11-29 13:48:58 -05:00
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
024f635aa9
Fixes Teleport spell
2015-11-29 14:33:40 +01:00
38eddb1421
Merge pull request #13179 from AnturK/academy
...
Wizard Academy Away Update
2015-11-29 21:06:34 +11:00
7b1a92885c
Merge pull request #13024 from TheNightingale/Nighting
...
Elite Syndicate Hardsuit
2015-11-29 21:05:36 +11:00
611fb49c1c
Wake me up inside
2015-11-29 00:58:30 -05:00
e9bbebfd36
Fixes inflict_handler spells not doing burn damage if brute damage was 0.
2015-11-28 11:42:38 -05:00
b14e9133d2
Academy Update
2015-11-28 12:35:41 +01:00
9fd9e5c21d
Makes user explicit in spell code
2015-11-28 12:35:40 +01:00
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
4079e1bb7f
Merge pull request #13158 from KorPhaeron/Nya
...
Removes references to "valid" from purrbation
2015-11-27 20:01:17 +00:00
5a166f6c71
change to datum proc
2015-11-27 18:26:48 +11:00
ce9ea0ca46
FUCK THIS FUCK EVERYTHING
2015-11-26 22:22:07 -05:00
e36853d7c9
Convert bots to simple animals - Updated 7.0
2015-11-26 22:06:07 +01:00
955406bc55
Merge pull request #13216 from tkdrg/why
...
Fixes VV not updating properly for non-datums
2015-11-26 23:36:39 +03:00
9fe9c2faa4
Remove side effects from Character Setup
2015-11-25 18:06:05 -05:00
f7c4ac2d9d
Fixes VV not updating properly for non-datums
...
Fixes #13211
2015-11-25 16:35:59 -03:00
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
4d3046e5cb
Terrible pun
2015-11-25 08:42:21 -06:00
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
bbbd4360d0
Fixes login runtimes for observers.
...
Some failsafes for new_player login.
2015-11-23 00:19:35 +01:00
c646656e79
Valid
2015-11-22 06:41:30 -06:00
4c899d2b34
Merge pull request #13063 from Incoming5643/subtypesof
...
Adds subtypesof(path)
2015-11-19 16:31:09 -06:00
2c4676757c
Adds a Synth Species, Admin only atm, Imitates a species and when they reach 50 HP their skin partially falls off. Adds a method for species to react to being force set by an admin.
2015-11-19 22:05:48 +00:00
0710ce5def
Merge pull request #13070 from octareenroon91/patch-30
...
Introduce the four-color pen
2015-11-19 18:42:26 +00:00
7333bede43
Merge pull request #13055 from Anonus/actionbuttons
...
Gives constructs action buttons, adds cool effects to cult turfs.
2015-11-18 20:26:47 +00:00
cba8a9a325
Merge branch 'c4runtimeFix' of git://github.com/phil235/-tg-station into phil235-c4runtimeFix
...
Conflicts:
code/modules/mob/mob.dm
2015-11-18 01:44:29 -06:00
c98a7a0d7e
Fixes merge conflicts, also a minor slipup with flags
2015-11-17 20:59:43 -05:00
Razharas
Incoming
Cheridan
duncathan salt
MrStonedOne
Nerd Lord
Aranclanos
Remie Richards
paprka
KorPhaeron
as334
AnturK
Jordie
YotaXP
Tkdrg
KorPhaeron
phil235
Menshin
Cheridan