Tigercat2000
288af9f92c
Revert "Merge pull request #4739 from monster860/vg-parallax"
...
This reverts commit 451c93437964f26d999f
2016-07-28 15:48:27 -07:00
monster860
b2cb87edc9
Merge branch 'master' into vg-parallax
2016-07-28 16:45:10 -04:00
TheDZD
3061214620
Merge pull request #5205 from Fox-McCloud/librarian-qol
...
Librarian QoL---Bookbag
2016-07-28 15:12:46 -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
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
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
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
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
0a574e59fe
Librarian QoL---Bookbag
2016-07-26 07:08:32 -04:00
Fox-McCloud
7f133c700d
tweak
2016-07-26 04:50:22 -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
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
Fox-McCloud
4d7b68ae23
Ports TG IV Drips
2016-07-23 20:30:05 -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
Fox-McCloud
25c01ef3ba
Fixes up apply_damage
2016-07-22 21:03:17 -04: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
Fox-McCloud
b6c7e5f251
tweak
2016-07-22 15:05:56 -04:00
TheDZD
f73f1b4a17
Merge pull request #5144 from Fox-McCloud/medical-stacks
...
Refactors Medical Stacks
2016-07-22 14:45:12 -04:00
Fox-McCloud
8c91bc11a9
\the
2016-07-22 14:36:38 -04:00
Fox-McCloud
fe8ef6ca69
Adds in Bola, Other Recipe Tweaks
2016-07-22 13:20:09 -04:00
Fox-McCloud
e4214a8181
Moves All Kitchen Stuff to Module
2016-07-22 09:02:10 -04:00
Twinmold
ed27fd3799
total += kills
...
Uses byond's simplier form... Damn Lua code is stuck in my head...
2016-07-22 07:35:24 -05:00
Twinmold
81c55b666d
Vox Raider Check Kills for Inviolate
...
Effectively, adds the check that makes it so you aren't allowed to kill
(many, at least) under the Inviolate. Doesn't check for deaths in the
server itself, only kills in the raiders minds, which the original code
failed to do by adding all deaths to voxkills. As we currently have,
it's a auto-complete objective, which is just a poor fix to the original
issue.
```var/vox_allowed_kills = 3``` gives them a little leeway, but can
easily be changed to any acceptable number.
🆑 Twinmold
Tweak: Vox Objective 4 now calculates the kills vox raiders actually
have, instead of always complete.
/🆑
2016-07-22 06:35:10 -05:00
Fox-McCloud
48eb7b8ec0
thought you could hide, huh
2016-07-22 06:54:40 -04:00
TheDZD
7fa74a1d1e
Re-adds PDA slot
2016-07-21 13:04:02 -04:00
Fox-McCloud
a4e7a41426
Refactors Medical Stacks
2016-07-21 12:26:21 -04:00
Fox-McCloud
706fd93f79
Fixes Brig Door Timers
2016-07-21 11:02:15 -04:00
