Tigercat2000
288af9f92c
Revert "Merge pull request #4739 from monster860/vg-parallax"
...
This reverts commit 451c934379 , reversing
changes made to 64f26d999f .
Conflicts:
SQL/paradise_schema.sql
SQL/paradise_schema_prefixed.sql
2016-07-28 15:48:27 -07:00
TheDZD
75a8ac632c
Merge pull request #5203 from Krausus/SpookyAdminClicks
...
Adds Admin Ghost Click Shortcuts
2016-07-28 17:09:21 -04:00
Krausus
56f6b3a14e
Adds multi-mob warning to admin click shortcuts
...
Also, cleans up admin_mob_info code a bit
2016-07-28 17:02:46 -04:00
monster860
b2cb87edc9
Merge branch 'master' into vg-parallax
2016-07-28 16:45:10 -04:00
TheDZD
3600a9d4b8
Merge pull request #5150 from FreeStylaLT/nocturnegank
...
Adds electrical grid check to random events.
2016-07-28 16:13:24 -04:00
TheDZD
36e7ab6251
Merge pull request #5204 from Fox-McCloud/virology-tweaks
...
Virology Tweaks
2016-07-28 15:40:23 -04:00
Fox-McCloud
4dad99025a
better desc
2016-07-28 15:21:14 -04:00
TheDZD
3061214620
Merge pull request #5205 from Fox-McCloud/librarian-qol
...
Librarian QoL---Bookbag
2016-07-28 15:12:46 -04:00
TheDZD
407cf4c695
Merge pull request #5206 from Kyep/equip_vox
...
Select Equipment: Vox / Greytide / Soviet Edition
2016-07-28 15:10:37 -04:00
Fox McCloud
ea2455625e
Merge pull request #5211 from Ty-Omaha/Tacticool
...
Gives Code Red ERT Combat Gloves
2016-07-28 15:03:31 -04:00
Fox-McCloud
eb43f01995
Fixes Blob, Again
2016-07-28 12:12:52 -04:00
TheDZD
25c7797e77
Merge pull request #5212 from Kyep/cryopod_fix
...
Fixes cryopod bug
2016-07-28 09:13:24 -04:00
Kyep
eb0d3f7558
Fixes cryopod bug
2016-07-27 00:21:45 -07:00
Kyep
9d9d16a0a0
Admiral Headset
2016-07-27 00:09:12 -07:00
Kyep
8a5743591c
Adds Mime Assassin, Tweaks
...
1) Adds Mime Assassin, counterpart to Tunnel Clown
2) Fixes backpack/internalsbox for some outfits
3) Fixes survivor/greytide lack of flashlight
4) Fixes xeno lack of gas mask
5) Fixes soviet soldier double-mateba, excessive c4, but insufficient
ammo
5) Fixes soviet admiral lack of ammo
2016-07-26 22:10:18 -07:00
Ty-Omaha
35d7ef97a2
ERT Gloves
2016-07-26 23:22:26 -04:00
Fox McCloud
bff1335a8b
Merge pull request #4996 from TullyBurnalot/AIFixer
...
AI Integrity Restorer EMP Rework
2016-07-26 22:49:04 -04:00
TullyBurnalot
cdb1778c55
Removes returns, adds Destroy()
2016-07-27 00:38:22 +01:00
TheDZD
4cba2b8d07
Merge pull request #5154 from Fox-McCloud/more-reagent-stuff
...
More Reagent Cleanup
2016-07-26 14:24:26 -04:00
Fox McCloud
6fc0435c05
Merge pull request #5155 from Twinmold93/voxkillcount
...
Vox Raider Check Kills for Inviolate
2016-07-26 14:22:53 -04:00
TheDZD
7616a33df4
Merge pull request #5162 from Crazylemon64/boom_buildmode
...
Adds an explosion buildmode
2016-07-26 14:13:37 -04:00
TheDZD
629caa47f8
Merge pull request #5165 from Fox-McCloud/alt-click-madness
...
Alt Click Madness
2016-07-26 14:08:21 -04:00
Fox-McCloud
0870c66303
tweak
2016-07-26 14:02:07 -04:00
TheDZD
49ad9a565d
Merge pull request #5192 from Fox-McCloud/makeshift-items
...
More Makeshift Items/Weapons
2016-07-26 13:33:16 -04:00
Fox McCloud
8f54ecbace
Merge pull request #5170 from Crazylemon64/dropall_fix
...
No longer drop bodyparts still in use
2016-07-26 13:30:30 -04:00
TheDZD
bcfa4d1863
Merge pull request #5171 from Fox-McCloud/apply-damage
...
Fixes up apply_damage
2016-07-26 13:28:43 -04:00
TheDZD
1a6ceee4bd
Merge pull request #5172 from Fox-McCloud/remove-cable-coil
...
Removes Cablecuffs...
2016-07-26 13:27:59 -04:00
Fox McCloud
25f38a1ee7
Merge pull request #5173 from Krausus/VotingTweaks
...
Voting System Improvements and Fixes
2016-07-26 13:26:08 -04:00
Fox McCloud
d32c7d55e2
Merge pull request #5182 from FlattestGuitar/loadouts_vBazilion
...
Further loadout tweaks.
2016-07-26 13:24:46 -04:00
Fox-McCloud
c05a7d5b75
derp
2016-07-26 13:23:58 -04:00
Fox-McCloud
e06933ec09
tweakssss
2016-07-26 13:21:06 -04:00
TheDZD
fdddff548f
Merge pull request #5184 from Fox-McCloud/tg-iv
...
Ports TG IV Drips
2016-07-26 13:19:06 -04:00
TheDZD
6dd37a9997
Merge pull request #5198 from Spacemanspark/cardboard-box-confusion
...
Fixes cardboard boxes confusion
2016-07-26 12:52:14 -04:00
Tigercat2000
f01f33bcec
Add crew manifest world/Topic
...
Returns JSON data in the format
{ department: [{ name: title }, { name: title }] }
2016-07-26 06:27:12 -07:00
Kyep
97446e611a
Ensures all loadouts have internals boxes
2016-07-26 04:27:30 -07:00
Kyep
fbfc840cd1
Select Equipment: Vox / Greytide / Soviet Edition
...
1) Adds loadouts:
- Vox (also handles Armalis)
- Greytide
- Greytide Leader
- Greytide Fake Xeno
- Syndicate Bomber
- Soviet Tourist
- Soviet Soldier
2) Fixes issues:
- Fixes issue with storage implant in spy loadout
- Dramatically reduces access on most loadouts, making them more usable
without creating OP antags.
2016-07-26 04:17:02 -07:00
Fox-McCloud
0a574e59fe
Librarian QoL---Bookbag
2016-07-26 07:08:32 -04:00
Fox McCloud
755ca2ee68
Merge pull request #5190 from Kyep/vamp_dethrall
...
Adds admin button to remove vamp thrall status
2016-07-26 06:28:37 -04:00
Fox-McCloud
cd544bee34
Virology Tweaks
2016-07-26 05:48:36 -04:00
Fox-McCloud
7f133c700d
tweak
2016-07-26 04:50:22 -04:00
Fox McCloud
e491fe33d2
Merge pull request #5178 from Krausus/biconizeVV
...
Replaces View Variables' Browsed Icons With Bicons
2016-07-26 03:42:21 -04:00
Fox McCloud
863ee10391
Merge pull request #5200 from TheDZD/admin-check-fixes
...
Assorted Admin Rights Check Fixes
2016-07-26 03:38:25 -04:00
Krausus
16500f0f27
Adds admin ghost click shortcuts
...
Also refactors extra mob info code into its own proc.
2016-07-25 23:16:21 -04:00
TheDZD
c7f016a702
Makes CC admin-only jobs check for R_EVENT instead of R_ADMIN, fixes some message spam for mentors that don't have enough access, fixes me fucking up and not checking for rights correctly in the telecomms reset verb.
2016-07-25 19:40:55 -04:00
Tom Heeren
9e4b00bd0d
Fixes cardboard boxes confusion
2016-07-25 14:42:07 -05:00
Fox-McCloud
e2db1c5838
tweaks
2016-07-25 03:47:30 -04:00
Fox-McCloud
0e64a91891
teleprod
2016-07-25 03:34:06 -04:00
Fox-McCloud
47b15bec0f
More Makeshift Items/Weapons
2016-07-25 02:35:01 -04:00
TheDZD
4a818f865c
Merge pull request #5159 from Fox-McCloud/bola
...
Adds in Bola, Other Recipe Tweaks
2016-07-24 23:37:24 -04:00
TheDZD
42e517d16a
Merge pull request #5186 from Fox-McCloud/mining-cleanup
...
Purges Unused Mining Files
2016-07-24 23:25:44 -04:00