Commit Graph

6652 Commits

Author SHA1 Message Date
Birdtalon
4bc42a609d paint bucket fix 2017-09-09 20:12:17 +01:00
Crazy Lemon
32e665aa97 Merge pull request #7909 from Citinited/nothing-could-go-wrong
Adds flaming shots and Flaming Moes
2017-09-02 18:53:11 -07:00
Birdtalon
d78c1a3fb9 wall-locker bugfix 2017-08-29 15:46:44 +01:00
tigercat2000
c281ee7b77 Revert "Buffs the HoP Door remote" 2017-08-28 21:35:18 -07:00
Fox McCloud
71cfaa2325 Merge pull request #7983 from Birdtalon/wall-lockers
Control click to open wall lockers.
2017-08-28 18:24:08 -04:00
Fox McCloud
70cd062699 Merge pull request #7999 from Birdtalon/door-remote
Buffs the HoP Door remote
2017-08-28 18:23:55 -04:00
Crazy Lemon
fdc8c6dc37 Merge pull request #8010 from Birdtalon/bee-cease
Makes Syndicate Bee-case sound local.
2017-08-28 15:10:34 -07:00
Fox-McCloud
16bff9cc86 longer musics 2017-08-27 19:49:40 -04:00
Birdtalon
ad703a69a1 makes the bee-case sound local 2017-08-24 23:58:24 +01:00
Birdtalon
d7a6833268 alters door remotes 2017-08-22 16:12:12 +01:00
Fox-McCloud
881c0e9d92 Merge remote-tracking branch 'upstream/master' into musics 2017-08-16 19:12:46 -04:00
tigercat2000
608a0b0644 Merge pull request #7759 from Citinited/flagged-for-review
Adds in-hand sprites for missing flags; adds a plasmaman flag; miscellaneous flag tweaks
2017-08-16 12:11:05 -07:00
tigercat2000
d90229e2ad Merge pull request #7839 from taukausanake/buffs_duffs
Buffs duffs
2017-08-14 10:57:06 -07:00
Birdtalon
7aa7634d4a fixes crates 2017-08-14 18:05:04 +01:00
Birdtalon
d22f02af01 shortcut to open wall lockers 2017-08-14 10:32:15 +01:00
KasparoVy
29ee96be8f Blood Trail Colouration is the Same as Pools
Blood pools had a duplicate definition of "NO_CLIENT_COLOUR" while it
wasn't defined at all for blood trails.

This resulted in a bug where upon wearing a pair of noir shades or
becoming colourblind, blood trails would take on a different colouration
than blood pools (drips, etc.)

Now resolved by moving the duplicate definition to a place where it can
do some good.
2017-08-09 23:14:39 -04:00
Fox-McCloud
ba9f53ba21 small performance tweak 2017-08-08 23:17:21 -04:00
taukausanake
3e86cb1a8c Merge branch 'Paradise-clean' into buffs_duffs 2017-08-06 22:07:10 -05:00
Fox McCloud
2dcae64f3a Merge pull request #7876 from Aurorablade/Clothes
Obligatory Vox in a Corset
2017-08-06 08:53:13 -04:00
Citinited
1e7c22acc8 it's update_icon not update_icons 2017-08-06 01:12:29 +01:00
Citinited
49ca1abc2a Formatting changes 2017-08-06 00:56:23 +01:00
Sam
6e995515ff whoops 2017-08-04 06:20:58 +01:00
Fox-McCloud
14b5bf981b fix 2017-08-02 03:26:54 -04:00
Fox-McCloud
d7da6cb94c Adds a Bunch of Instruments 2017-08-02 03:19:03 -04:00
Crazy Lemon
59a9df3762 Merge pull request #7906 from Fox-McCloud/remove-cael
Removes Unused Xenoarch Code
2017-08-01 22:15:22 -07:00
Crazy Lemon
c85acf0a81 Merge pull request #7875 from Fox-McCloud/sound-update
Sound Update/Refactor
2017-08-01 22:09:46 -07:00
Citinited
52ce095479 A bunch of code-based tweaks 2017-08-02 04:02:26 +01:00
Fox-McCloud
6bd0d17527 performance 2017-07-31 14:01:15 -04:00
Citinited
576adfb4e9 Adds the ability for people to light alcoholic shots; adds the flaming moe! 2017-07-30 09:52:13 +01:00
Fox-McCloud
c6465f5be7 yep, still need this 2017-07-29 20:41:38 -04:00
Fox-McCloud
968050c5ce Removes Unused Xenoarch Files 2017-07-29 20:13:45 -04:00
Fox-McCloud
38edeada02 Chem Grenades Log Reagents 2017-07-28 00:56:37 -04:00
Aurorablade
04d4244b90 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Clothes 2017-07-26 00:07:24 -04:00
Fox-McCloud
f78c507122 Sound Update/Refactor 2017-07-25 20:35:38 -04:00
Citinited
479f0b869f Adds a plasmaman flag! 2017-07-25 22:55:32 +01:00
Citinited
b92143fce0 Moved flags to their own file, and added missing flag sprites to the game.
Added drask, tajaran, unathi, vox, vulpkanin, and wizard flag in-hand
sprites
Fixed syndicate flag in-hands
2017-07-25 22:55:32 +01:00
Citinited
ce01b7e00f Removes default fire overlay from burning flags 2017-07-25 22:55:32 +01:00
Citinited
e662707276 Burning flags now correctly updates their in-hand sprite 2017-07-25 22:55:31 +01:00
Fox-McCloud
81d3acb6d6 Merge remote-tracking branch 'upstream/master' into removes-cryobags 2017-07-25 15:21:28 -04:00
Fox McCloud
98ad0cdb76 Merge pull request #7523 from FlattestGuitar/no-stel-ples
Removes boring theft objectives
2017-07-25 14:55:37 -04:00
Crazy Lemon
e5a6d4a96c Merge pull request #7849 from Fox-McCloud/remove-comments
Removes All Comments about auto-correction and Finddeclaration.exe
2017-07-25 10:41:02 -07:00
Fox McCloud
d4f305cc72 Merge pull request #7583 from Kyep/smite_hunter
Expands Smite / Dark Priest to cover many characters
2017-07-25 12:24:45 -04:00
Crazy Lemon
da7bea7c61 Merge pull request #7850 from Fox-McCloud/reagenttssss
Reagents Cleanup
2017-07-25 03:43:17 -07:00
Crazy Lemon
e574c84935 Merge pull request #7858 from Fox-McCloud/health-implant-fix
Fixes Health Implants
2017-07-25 03:39:32 -07:00
Fox-McCloud
5d2429e15f Merge remote-tracking branch 'upstream/master' into reagenttssss 2017-07-25 06:31:11 -04:00
Crazylemon64
9c86d07252 Adds decorative telecomms machinery for map making 2017-07-23 21:08:10 -07:00
Fox-McCloud
89ff21c755 Fixes Health Implants 2017-07-23 17:26:37 -04:00
Fox-McCloud
4419683890 Reagents Cleanup 2017-07-22 05:18:13 -04:00
Fox-McCloud
027e7619f5 Removes All Comments about auto-correction and Finddeclaration.exe 2017-07-22 02:54:45 -04:00
Crazy Lemon
6a4e69f741 Merge pull request #7845 from Fox-McCloud/organsss
Fixes IPC and Diona Knockdown Immunity
2017-07-21 23:05:00 -07:00