cfcecba389
Merge pull request #15575 from phil235/ReviveFix1
...
Fixes mob revival
2016-02-17 20:42:10 -06:00
a2ef1ad26f
Merge pull request #15545 from Shadowlight213/defenderpref
...
Makes wizard academy defender respect prefs
2016-02-17 19:57:02 -06:00
f3fd49349c
Prisoner Transport
2016-02-17 06:32:32 -06:00
7e1efca13a
Created two new procs to handle reviving mobs more easily:
...
- can_be_revived(), used so we don't revive a mob who would immediately die again (lack of brain organ for carbons).
- fully_heal(), called by revive when we want to completely heal a mob before trying to ressuscitate it.
I gave some arguments to revive() so the proc can be used by more than just the admin healing code (ai revived by the AI fixer console, drone revived by another drone clicking it, strange reagent ressuscitating you, borg revived by restart circuitboard, changeling using his revive ability, etc)
This fixes borg revival not updating its vision correctly and not updating the diagnostic HUD. Same fix for changeling revival.
2016-02-16 23:27:08 +01:00
b46b11d75d
Makes wizard academy defender respect prefs
2016-02-14 23:03:22 -08:00
2547e8dc32
Merge pull request #15300 from Buggy123/patch-16
...
Makes the explosion size of BS artillery a configurable variable
2016-02-10 13:18:05 -03:00
d9a8268fce
Makes preloader not gc needlessly
2016-02-09 17:35:48 +01:00
a2b0d47250
Makes explosion of BS artillery configurable
2016-02-07 22:32:38 -05:00
37c0b23483
New CTF gear
2016-02-06 19:38:47 -06:00
9f659fd0d0
Adds an easy way for admins to enable instagib mode
2016-02-06 08:55:59 -06:00
6cef32be12
Adds instagib mode to CTF
2016-02-06 07:11:51 -06:00
063dd9fb84
Get the code running on 510
...
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
2016-02-04 17:19:40 -06:00
0f39a20d4a
Machines are apparently not anchored by default
2016-02-01 22:40:22 -06:00
07ca64fdbb
King of the Hill Fixes
2016-02-01 22:11:46 -06:00
0d3e68c1d0
Merge pull request #15099 from PKPenguin321/patch-12
...
Dice of Fate -> Die of Fate
2016-01-31 22:20:05 -03:00
faa81107d6
Merge pull request #15079 from KorPhaeron/ctf_bugfix
...
CTF bugfixes and control point
2016-01-31 21:23:52 -03:00
b56879d21e
Parentheses
2016-01-31 18:16:05 -06:00
aed4a51223
Restores factions to being lists
2016-01-31 17:46:01 -06:00
9d8275e6e8
Merge pull request #15078 from KorPhaeron/space_suit
...
Removes inhand slowdown from space suits
2016-01-31 13:58:48 -03:00
7891ac2805
Merge pull request #15034 from AnturK/shuttle_templates
...
Adds map template datum and size preloading
2016-01-31 13:33:30 -03:00
afc0e1e4c6
Capture the Flag fixes and control point
2016-01-31 04:20:35 -06:00
5854c87ce5
removes the letter c
...
dice -> die
2016-01-30 18:38:35 -08:00
eedd50ac33
Fixes flag duping
2016-01-30 04:51:12 -06:00
efb91fb10a
Handslow
2016-01-30 04:30:55 -06:00
d3765adbe0
Merge pull request #14988 from KorPhaeron/ctf
...
Shuffles CTF check order
2016-01-29 21:58:40 -03:00
8999db80b4
Fixes shuttles loading improperly in templates
...
Adds template datum and preloader
2016-01-29 20:51:12 +01:00
0826128459
Merge pull request #14698 from Firecage/absolutepathsandifs
...
Absolute paths and changes one liner if's/else's/else if's.
2016-01-29 03:15:12 +03:00
7b2dc3fe73
Shuffles check order
2016-01-27 19:13:21 -06:00
7f96592b87
Merge Conflict Fix
2016-01-27 13:29:38 +02:00
78a0df6b42
Mispelled a var name
2016-01-27 03:42:20 -06:00
578295cc6d
Fixes spawn protection
2016-01-27 03:34:50 -06:00
74db42953b
Fixes victory
2016-01-26 19:28:12 -06:00
c4f912d5cc
Fixes team protection/scoring etc
2016-01-26 18:38:38 -06:00
92f2c149cd
Adds blue beacon sprite
2016-01-26 00:13:41 -06:00
ef2321db74
CTF Disabled by default
2016-01-25 00:59:34 -06:00
b445eee80d
CTF Revival
2016-01-25 00:52:25 -06:00
a44f985566
Fixes dark wishgranter not killing faithless properly
2016-01-23 21:50:53 +01:00
8b13e0cfdd
i love map conflicts
2016-01-21 01:20:25 -05:00
af5f726089
lodesmapedits
2016-01-21 01:07:06 -05:00
d2bd6871d5
Merge Conflict Fix
2016-01-20 14:07:14 +02:00
1c34479376
Fix uplink code once and for all
...
Fixes #14733
2016-01-19 16:42:57 -06:00
d1327d4076
Merge conflict fix
2016-01-19 10:02:50 +02:00
b33c6f216d
Tidy tooltips; hide lock button from non-lockable uplinks
2016-01-18 14:27:34 -06:00
ff5d6292c8
tgui uplinks; repath uplinks
2016-01-18 14:22:00 -06:00
0cb6814c18
Merge conflict fix
2016-01-17 19:15:30 +02:00
332bde0f4f
Does the rest of the if()'s/ else's
2016-01-17 19:03:12 +02:00
bff752a69a
Merge pull request #14513 from KorPhaeron/why
...
Removes teleport scroll from snowdin
2016-01-09 12:39:23 -03:00
7bafb9e1fd
Snowdin
2016-01-08 07:37:57 -06:00
5589ac7559
Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework"
...
This reverts commit 52a45b629219b43ba668
2016-01-07 23:15:35 -03:00
bc8e46b8a3
Merge pull request #14440 from MrStonedOne/patch-119
...
Fixes map loader not initializing map edited path/type vars
2016-01-07 20:28:56 -03:00
Cheridan
KorPhaeron
phil235
Shadowlight213
tkdrg
AnturK
Buggy123
Bjorn Neergaard
KorPhaeron
PKPenguin321
Razharas
Firecage
MMMiracles