Commit Graph

3499 Commits

Author SHA1 Message Date
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.

![nknwxga](https://cloud.githubusercontent.com/assets/6348574/17047510/9ab3c986-4f93-11e6-83b8-c3e4598704eb.gif)

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
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
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
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
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
659af49a43 tweak 2 2016-07-22 18:36:10 -04:00
TheDZD
235f248e12 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 2016-07-22 18:27:14 -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
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
TheDZD
904fbd824c Merge pull request #5099 from tigercat2000/LOOK_MA_TWO_EARS
Saycode refactor/improvements
2016-07-20 14:58:55 -04:00
Fox McCloud
ceced8c832 Merge pull request #5095 from tigercat2000/ACTION_BUTTONS
Action Button Update
2016-07-19 23:40:51 -04:00
Tigercat2000
6650991be1 Tank action buttons now toggle the tank 2016-07-19 20:34:50 -07:00
Fox-McCloud
337e0c2896 DERP 2016-07-19 17:31:40 -04:00
Tigercat2000
9f8ba253c9 Saycode refactor/improvements
- Refactored multiple bits of saycode to be less eyeburning code
 - Radios now properly report special channel messages (binary, hivemind)
 - Animals with no speak list no longer show unfiltered messages to
   everyone.

 - Fun part:
   - Improves handling of headsets for the two ear system.
     - The right headset will now be talked into if the left headset
       reports that it is unable to send the message on the chosen
       channel/mode.
     - This means that instead of having to swap headsets around, wearing
       a headset on either ear will grant you access to all of it's
       channels.
     - The left headset will take priority, which really only affects when
       it's set to a non-standard frequency.
2016-07-18 19:17:11 -07:00
Tigercat2000
56a09db739 Action Button Update
- Refactors action button backend
   - Action buttons are no longer checked on Life(), items are responsible
     for adding/removing/updating them.
   - Item action buttons are no longer a static action_button_name define,
     items define actions_types, which is a list of paths.
   - Items can now have multiple action buttons.
     - This is handled by new arguments to ui_action_click, the first
       parameter is the user, the second is the path of the action datum
       that was invoked.
 - Refactored how internals function
   - You may now directly switch internals without breaking anything.
   - The internals icon has been updated to be more consistent.
 - Added action buttons for jetpacks
 - Added action buttons for oxygen tanks
 - Uses-based implants now qdel() themselves when they run out of uses.
   This is somewhat a buff to traitor implants, but it's such a minor
   change. The actual reasoning is so that the action buttons are properly
   removed.
 - Fixed a bug with the "Boo" spell which resulted in IsAvailable failing
   for certain ghosts.
 - You can now shift-click on movable HUD elements to reset them to the
   proper position (thank fucking christ)
2016-07-18 13:23:01 -07:00
Fox-McCloud
1c1ebe717b tweak 2016-07-18 09:30:39 -04:00
Fox-McCloud
3ae35fce71 Ports Powerfist 2016-07-18 07:46:42 -04:00
Fox-McCloud
b8239ac1a4 Adds Shielded Hardsuit to Nuke Ops 2016-07-18 07:03:15 -04:00
SamCroswell
15a8b1d7d6 Merge Conflict Resolution 2016-07-16 18:47:18 -04:00