TheDZD
0cc2051f8a
Merge pull request #5251 from Fox-McCloud/fire-system
...
Implements Fire System
2016-08-01 19:39:50 -04:00
Fox McCloud
31ad2a84f2
Merge pull request #5132 from Kyep/atmos_grenades
...
Atmos Grenades (aka: how to kill people with atmos)
2016-07-31 22:40:03 -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
13ba6b6429
Merge pull request #5255 from IcyV/Electric-Axe-2--Electric-Boogaloo
...
Gives Atmos-Traitors a new fireaxe.
2016-07-31 00:48:06 -04:00
IcyV
da360c8703
Gives Atmos-Traitors a new fireaxe.
...
Give Atmos-traitors a unique 10TC axe to buy.
This axe starts with a single charge and can gain more charges over time
by destroying windows and grilles. Each grille or window destroyed has a
4% chance of giving another charge to the axe. On a charged hit the axe
will hit for 30 brute and 30 burn. It will otherwise function as a
normal fireaxe if out of charges.

Sprites courtesy of Fullofskittles
🆑 IcyV
add: Adds a unique axe for Atmos-traitors
/🆑
2016-07-29 21:08:50 -07:00
Crazylemon64
ae43de3652
Integrates the z level manager with the space transition system
2016-07-29 19:11:36 -07:00
Taylor Wood
869c13e493
Fixes exploding backpacks
2016-07-29 23:05:59 +01:00
Fox-McCloud
95dcbbc77b
cleaning up old code
2016-07-29 18:01:59 -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
Kyep
4f01a05ae6
Changed Indentation
2016-07-28 22:03:55 -07: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
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
TheDZD
4cba2b8d07
Merge pull request #5154 from Fox-McCloud/more-reagent-stuff
...
More Reagent Cleanup
2016-07-26 14:24:26 -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
c05a7d5b75
derp
2016-07-26 13:23:58 -04:00
Fox-McCloud
e06933ec09
tweakssss
2016-07-26 13:21: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
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
Kyep
01febeadb4
Refactor
2016-07-24 19:15:54 -07:00
Kyep
114980c4ed
Major Revamp
...
1) Only Plasma Fire and N2O Knockout grenades exist now.
2) Both types now use the clusterbuster mechanic, rather than new
ZAS-like spread code, to distribute their gasses. This means their
spread is slower, but they can potentially cover more area.
3) You only get one of each type of grenade in a kit.
4) Massive refactor and elimination of code.
2016-07-23 02:01:31 -07: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
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
48eb7b8ec0
thought you could hide, huh
2016-07-22 06:54:40 -04:00
Fox-McCloud
a4e7a41426
Refactors Medical Stacks
2016-07-21 12:26:21 -04:00
TheDZD
6d095d50f5
Merge pull request #5102 from Fox-McCloud/reagent-refactors-continued
...
More Reagent Refactoring and Cleanup
2016-07-21 10:12:14 -04:00
TheDZD
72932cf5c6
Merge pull request #5091 from Fox-McCloud/shielded-hardsuit
...
Adds Shielded Hardsuit to Nuke Ops
2016-07-21 09:58:20 -04:00
TheDZD
c8dae2d7b5
Merge pull request #5092 from Fox-McCloud/powerfist
...
Ports Powerfist
2016-07-21 09:27:07 -04:00
Kyep
70c8d5248c
Typo Fix
2016-07-21 02:26:35 -07:00
Fox-McCloud
0a8dca713c
proper ear damage proc
2016-07-21 04:24:12 -04:00
Kyep
aa856556ed
Atmos Grenades, v1
2016-07-20 23:31:39 -07:00
Fox-McCloud
00a470fd6d
removes stupid sdisabilities
2016-07-21 02:24:54 -04:00