Commit Graph

4119 Commits

Author SHA1 Message Date
tigercat2000
484af3afc4 Merge pull request #7827 from FalseIncarnate/plumbing
Plumbing Update
2017-09-12 20:20:23 -07:00
tigercat2000
ab4ca3ae38 Merge pull request #8055 from Kyep/wolono
Nerfs missionary/wololo staff
2017-09-12 20:00:21 -07:00
Birdtalon
4bc42a609d paint bucket fix 2017-09-09 20:12:17 +01:00
Kyep
3a70eb0e31 Removes zealots_made 2017-09-08 16:46:39 -07:00
Kyep
1935856563 Warning on conversion attempt 2017-09-07 12:51:48 -07:00
Kyep
b590800215 Changes nerf. No more damage. Now longer delay / blocked by mindshields 2017-09-07 12:18:53 -07:00
Kyep
c2db663d62 Adds random multiplier 2017-09-07 02:26:18 -07:00
Kyep
e61af42f00 Nerfs missionary staff 2017-09-07 02:06:43 -07:00
tigercat2000
c281ee7b77 Revert "Buffs the HoP Door remote" 2017-08-28 21:35:18 -07: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
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
FalseIncarnate
676937a1cb Mountables "rose" span removal
Removes the rose class from spans in mountables code.

More occurances of this ancient span class have been unearthed and will
be handled in a separate PR since that'd end up being unnecessary bloat
in this PR, plus some of those cases need some fixing anyways (span
without /span)
2017-08-19 01:33:23 -04: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
taukausanake
3e86cb1a8c Merge branch 'Paradise-clean' into buffs_duffs 2017-08-06 22:07:10 -05:00
Citinited
1e7c22acc8 it's update_icon not update_icons 2017-08-06 01:12:29 +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
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
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
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
Fox McCloud
7cda52c713 Merge pull request #7818 from Crazylemon64/item_stumbling
Item stumbling refactor
2017-07-22 01:55:19 -04:00
Crazylemon64
88edf50be3 Agh why did it stick spaces in there 2017-07-21 22:45:20 -07:00
Crazylemon64
e0178ff8fd Final changes 2017-07-21 22:27:50 -07:00
Fox McCloud
b37c1cf4e7 Merge pull request #7814 from Crazylemon64/many_fixes
Runtime killer v2
2017-07-22 00:39:10 -04:00
Crazylemon64
50d5e18ef6 Moves soap into a single file 2017-07-21 15:20:23 -07:00
Crazylemon64
807084e304 Most of fox's changes 2017-07-21 15:20:12 -07:00
Fox-McCloud
1ecd7f13fc instant updates 2017-07-21 02:19:12 -04:00
Fox-McCloud
02f74932e2 Fixes IPC and Diona Knockdown Immunity 2017-07-20 21:01:55 -04:00
taukausanake
730cfd3d2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into buffs_duffs 2017-07-19 22:08:40 -05:00
tigercat2000
e0dad32b50 Merge pull request #7806 from Fox-McCloud/FUCK-YOUR-CUNT-YOU-SHIT-EATING-CUNT-TILL-YOU-ARE-A-MASS-EATING-SHIT-CUNT-EAT-PENISES-IN-YOUR-FUCK-FACE-AND-SHIT-OUT-ABORTIONS-TO-FUCK-UP-SHIT-IN-YOUR-ASS-YOU-COCK-FUCK-SHIT
Removes Bay's Wound System
2017-07-19 14:13:49 -07:00
Crazylemon64
a8e7716649 Refactors slipping to be completely general for items 2017-07-16 19:20:55 -07:00
FlattestGuitar
ead42d5a27 Merges conflicts 2017-07-16 23:58:43 +02:00
Crazylemon64
3a00e0f083 Fixes for numerous runtimes 2017-07-16 14:42:11 -07:00
Fox-McCloud
cb35d1f6e9 Binsult.ogg 2017-07-15 12:12:59 -04:00