Commit Graph

22639 Commits

Author SHA1 Message Date
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
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
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
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
Fox McCloud
e0f2d4eef5 Merge pull request #5100 from TheDZD/salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt
Re-adds PDA Slot
2016-07-24 23:22:15 -04:00
Kyep
aba7e7058d Fixes #5189 2016-07-24 18:58:10 -07:00
Krausus
6cff9b10d6 Further voting controller tweaks
- Adds admin logging to creating and canceling votes
- Adds exception handling
- Adds deletion handling (should, theoretically, never be necessary)
- Adds tick-checking, just in case there's a lot of clients watching a
vote
- Adds the vote controller to the "debug controller" list
- Fixes that one "if" Tiger whined about
2016-07-24 19:46:34 -04:00
Mieszko Jędrzejczak
800669a2dd Dresses sandals, dress sandals, sandals. 2016-07-24 22:28:10 +02:00
Mieszko Jędrzejczak
dc8c0df65d Shines shoes, shines. 2016-07-24 22:18:07 +02:00
Fox-McCloud
2a3b3fbcb5 Purges Unused Mining Files 2016-07-24 07:31:04 -04:00
Fox-McCloud
4d7b68ae23 Ports TG IV Drips 2016-07-23 20:30:05 -04:00
Mieszko Jędrzejczak
452ce45470 Adds things, things. 2016-07-23 22:20:40 +02:00
Krausus
77c8a4f0e0 Makes VV use bicons 2016-07-23 12:20:28 -04:00
Isaac Erwin
8697578444 I need to go to bed 2016-07-23 06:34:24 -04:00
Isaac Erwin
31dc49cec7 Fixes the slash thing too, because Fox doesn't have any faith in me, among other reasons 2016-07-23 06:19:02 -04:00
Isaac Erwin
3fdee319e4 Fixes corporate security uniforms not being selectable 2016-07-23 06:03:59 -04:00
Krausus
5b21a9a785 Improves voting system
- Makes votes show votes for winning option, or all options in a custom
vote
- Makes the voting panel automatically update
- Makes the voting panel use the browser datum
- Turns the voting notice into a clickable link
- Fixes admin status not properly being checked when the voting page is
refreshed
- Replaces vote process with a spawned loop in the vote controller
- Removes vote processing from the pre-game game ticker
2016-07-23 02:03:19 -04:00
Fox-McCloud
8a2e78c323 Removes Cablecuffs... 2016-07-22 22:58:50 -04:00
Krausus
334894ea3a Makes vote controller pathing non-relative
This is a separate commit so other changes are actually visible in the
diffs
2016-07-22 22:00:58 -04:00
Fox-McCloud
25c01ef3ba Fixes up apply_damage 2016-07-22 21:03:17 -04:00
Crazylemon64
ca20966b96 No longer drop bodyparts still in use 2016-07-22 16:54:08 -07:00
Fox-McCloud
d83fe43331 tweak 2016-07-22 19:25:07 -04:00
Fox-McCloud
659af49a43 tweak 2 2016-07-22 18:36:10 -04:00
TheDZD
235f248e12 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 2016-07-22 18:27:14 -04:00
Fox-McCloud
451044863e Alt Click Madness 2016-07-22 16:09:16 -04:00
TheDZD
79d51a57da Refactors telegun, mimicgun, and tempgun 2016-07-22 16:08:17 -04:00
Crazylemon64
7e76405b11 Adds an explosion buildmode for testing atmos 2016-07-22 12:27:09 -07:00
Fox-McCloud
b6c7e5f251 tweak 2016-07-22 15:05:56 -04:00