Commit Graph

13960 Commits

Author SHA1 Message Date
Fox McCloud
513f796ec4 Merge pull request #5277 from Crazylemon64/robojanitor_disposal_fix
No more throwing away janiborg garbage bags
2016-08-01 20:15:09 -04:00
TheDZD
0cc2051f8a Merge pull request #5251 from Fox-McCloud/fire-system
Implements Fire System
2016-08-01 19:39:50 -04:00
Crazylemon64
c2f1045741 Now with less extra junk 2016-08-01 14:10:02 -07:00
Fox McCloud
9f7c4388dd Merge pull request #5276 from TheDZD/fecking-sounds
Massive Playsound() Performance Improvement
2016-08-01 14:32:55 -04:00
TheDZD
13d2c6c677 sound lag fixes 2016-08-01 14:10:09 -04:00
Fox McCloud
b8f527febe Merge pull request #5240 from TheBeoni/PodPilot
Adds Pod Pilot Jumpsuit
2016-07-31 22:44:59 -04:00
Fox McCloud
6bdd3d53a5 Merge pull request #5229 from Allfd/Alffd-Fluff
Alffd fluff sprites
2016-07-31 22:42:49 -04:00
TheDZD
6fb43d3d1e pAIs are no longer illusionists 2016-07-31 21:59:47 -04:00
Fox McCloud
5b6a13130a Merge pull request #5223 from Aurorablade/Voxpireyaya
Alternative to #5219 :super snowflake edition
2016-07-31 21:42:15 -04:00
Fox McCloud
c9f6bc7e2c Merge pull request #5243 from Aurorablade/CrebSnipSnip
Readds Glove snipping
2016-07-31 21:41:15 -04:00
Fox-McCloud
bf5a467697 better check 2016-07-31 16:13:19 -04:00
Fox McCloud
4c40a74746 Merge pull request #5254 from Crazylemon64/space_allocation
Updates space transitions and integrates it with the space management module
2016-07-31 12:18:19 -04:00
Fox-McCloud
1da7d26b1e tweaks 2016-07-31 11:56:42 -04:00
allfd
9fe03184c0 Added additional sanity check 2016-07-30 19:21:15 -04:00
Fox McCloud
3ae033ee41 Merge pull request #5257 from Krausus/NullObjectiveFix
Fixes Round-End Objective List Runtimes
2016-07-30 18:46:57 -04:00
Fox McCloud
634da17cb8 Merge pull request #5244 from TullyBurnalot/BugFixQuest1
ATMs can have fingerprints
2016-07-30 18:46:10 -04:00
Crazylemon64
652c1bbecf Makes a certain tiger pre-emptively happy 2016-07-30 14:15:17 -07:00
Krausus
a55f9d1f35 Fixes nulling of objectives lists 2016-07-30 11:55:22 -04:00
Krausus
545660f474 Fixes late-join window's round duration 2016-07-30 02:27:58 -04:00
Crazylemon64
ffc1877195 Fixes a minor hiccup 2016-07-29 19:39:17 -07:00
Crazylemon64
af5d42a5a4 You're not supposed to be there 2016-07-29 19:21:09 -07:00
Crazylemon64
ae43de3652 Integrates the z level manager with the space transition system 2016-07-29 19:11:36 -07:00
Aurorablade
0cb31c70c2 Mangled fingerless gloves
or fethas attempts to address black gloves
2016-07-29 18:05:48 -04:00
Aurorablade
8df912f1d7 removes mask check 2016-07-29 17:15:16 -04:00
Fox-McCloud
731600a21f tweaks 2016-07-29 17:07:25 -04:00
Fox-McCloud
bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
TullyBurnalot
7ef79222ae Removes pointless src. Again 2016-07-29 10:24:14 +01:00
TullyBurnalot
96dbc5eaa7 Can leave fingerprints on ATMs 2016-07-29 07:31:16 +01:00
Aurorablade
5e54f38103 FOOOOOOOOOOOOOOXXXXXXXXXXXXXXXXXXXXXXXXXXXX 2016-07-28 23:58:25 -04:00
Crazylemon64
94c0bbff6a Something to show to DZD 2016-07-28 19:07:02 -07:00
Allfd
a2471f2718 Git ate a line for some reason 2016-07-28 21:59:02 -04:00
Allfd
e010f1bd01 Now supports 64 height sprites 2016-07-28 21:52:53 -04:00
TheBeoni
06787dbee7 Adds Pod Pilot Jumpsuit 2016-07-29 03:43:39 +02:00
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
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
Aurorablade
5e1474dbde tweaks 2016-07-28 07:13:33 -04:00
Aurorablade
0e858e3be5 i suck yous blood yaya? 2016-07-28 00:20:04 -04: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
TheDZD
4cba2b8d07 Merge pull request #5154 from Fox-McCloud/more-reagent-stuff
More Reagent Cleanup
2016-07-26 14:24:26 -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