Commit Graph

1047 Commits

Author SHA1 Message Date
TheDZD
49ad9a565d Merge pull request #5192 from Fox-McCloud/makeshift-items
More Makeshift Items/Weapons
2016-07-26 13:33:16 -04:00
Fox McCloud
d32c7d55e2 Merge pull request #5182 from FlattestGuitar/loadouts_vBazilion
Further loadout tweaks.
2016-07-26 13:24:46 -04:00
Fox-McCloud
47b15bec0f More Makeshift Items/Weapons 2016-07-25 02:35:01 -04:00
Mieszko Jędrzejczak
452ce45470 Adds things, things. 2016-07-23 22:20:40 +02:00
Fox-McCloud
fe8ef6ca69 Adds in Bola, Other Recipe Tweaks 2016-07-22 13:20:09 -04:00
TheDZD
977aa93e44 Merge pull request #5089 from Fox-McCloud/clothing-restrictions
Removes Tajaran and Unathi Glove+Shoe Restriction: Loadout Change
2016-07-21 10:09:36 -04:00
TheDZD
d6f9a63296 Merge pull request #5112 from FreeStylaLT/justwhothehelldoyouthinkIam
Adds a chameleon secHUD to traitor uplink store
2016-07-21 09:43:57 -04:00
TheDZD
544e8e2e30 Merge pull request #5107 from Fox-McCloud/buttonssss
Fixes Performance Issue with Action buttons, removes redundant verbs
2016-07-21 09:23:54 -04:00
Fox-McCloud
45e1d5fb7e ha.... 2016-07-20 22:16:47 -04:00
Mieszko Jędrzejczak
7d02fd169d yeeeehaw 2016-07-21 04:14:56 +02:00
FreeStylaLT
a1ff35078c adds the chameleon sechud to traitor uplink 2016-07-20 13:51:49 +03:00
Fox-McCloud
eaf82cd423 Fixes Slow Action Buttons, Removes Verbs 2016-07-20 02:44:34 -04:00
Fox McCloud
ceced8c832 Merge pull request #5095 from tigercat2000/ACTION_BUTTONS
Action Button Update
2016-07-19 23:40:51 -04:00
SamCroswell
7fc24c2688 Merge Conflicts Resolution. Again. 2016-07-18 19:43:38 -04: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
KasparoVy
00558bd109 Adds Vox-fitted Hydroponic HUD (nightvision version incl.) (#5082) 2016-07-18 01:57:53 -04:00
Fox-McCloud
e039d4debe Removes Tajaran and Unathi Glove+Shoe Restriction: Loadout Change 2016-07-18 00:30:50 -04:00
LittleBigKid2000
d268c1d6d0 Stethoscope fixes and additions (#5015)
* Stethoscope fixes and additions

Now with less ❄️. At least, the species ❄️ kind.

- Stethoscopes now check for a heart and lungs. If the target doesn't
have either, the user won't hear anything. Sure, this means the user
will still hear a pulse if the target just has lungs and vice versa, but
you'll probably be dead or have microbattery or something if you don't
have both.
- Using the stethoscope on yourself will display a message that uses
'your' instead of 'his' or 'her'.
- Using a stethoscope on someone will tell the user if the target is
having a heart attack ("hear an irregular pulse and respiration")
- The messages displayed will properly use 'the'. ("[user] places the
stethoscope" instead of "[user] places stethoscope")

I don't know why I'm bothering with this, no one uses stethoscopes for a
good reason.

* (Hopefully) fixes the same message for lungs but no heart. Also reduces the oxyloss threshold thing. I probably did this very wrong.

* Tully got salty because I stole his PR, so we collaborated

* Rewrites the code to be less shit, probably
2016-07-17 21:43:51 -04:00
Fox-McCloud
54f3f9d207 Fixes Shields and Syndi Rigs 2016-07-17 06:14:26 -04:00
SamCroswell
15a8b1d7d6 Merge Conflict Resolution 2016-07-16 18:47:18 -04:00
Fox McCloud
cb0973346b Merge pull request #4766 from Kyep/parole
Parole
2016-07-16 11:35:37 -04:00
TheDZD
9bf946b5b6 Merge pull request #5054 from Fox-McCloud/mining-tweaks
Various Mining Tweaks
2016-07-16 10:57:54 -04:00
Fox McCloud
ac9a94bcb1 Merge pull request #5063 from FlattestGuitar/coats
Fixes some problems with the loadout system, changes costs a bit.
2016-07-16 10:46:52 -04:00
Fox-McCloud
e6c02e3a2c Merge remote-tracking branch 'upstream/master' into mining-tweaks 2016-07-15 23:16:00 -04:00
Fox McCloud
be8cc0432d Merge pull request #4691 from taukausanake/plant_hud
Hydroponics HUD
2016-07-15 21:47:36 -04:00
SamCroswell
0466499f86 Personal Crafting - Initial Commit 2016-07-15 16:25:37 -04:00
Mieszko Jędrzejczak
845317669a Coat armor value, whoops. 2016-07-15 21:50:26 +02:00
Fox McCloud
5107bca5dd Merge pull request #4899 from FlattestGuitar/loadouts
Did someone say "loadouts"?
2016-07-15 11:25:34 -04:00
Mieszko Jędrzejczak
96574c2e0b Panders to Fox's underground gaming habits. 2016-07-15 17:16:52 +02:00
Isaac Erwin
4737f05736 Does the thing fox and kasparoVy said 2016-07-15 05:38:14 -04:00
Fox-McCloud
0fb2bfd8f1 Various Mining Tweaks 2016-07-14 22:07:04 -04:00
Isaac Erwin
5455882433 Fixes chameleon jumpsuits not updating properly when EMPd
Fixes chameleon jumpsuits not updating the user's appearance when EMPed
and not properly reverting back to the default form when the EMP effect
wears off.
2016-07-14 09:03:16 -04:00
Mieszko Jędrzejczak
7f59ffda31 Fixes srcs, srcs. 2016-07-13 10:34:51 +02:00
Mieszko Jędrzejczak
52fbdd48b6 Adjusts. 2016-07-13 03:53:14 +02:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
Mieszko Jędrzejczak
8f5ddf2be1 Fixes conflicts, conflicts. 2016-07-10 13:03:01 +02:00
Fox McCloud
276160ef8f Merge pull request #4928 from TullyBurnalot/Monocle!
Prescription Monocles
2016-07-09 18:31:16 -04:00
TheDZD
04d5219d6a Merge pull request #4929 from Fox-McCloud/hit-reactions
Hit reactions
2016-07-09 18:30:37 -04:00
Fox McCloud
c98ba8de79 Merge pull request #4925 from TheDZD/no-looking-back-no-regrets
The Honkening
2016-07-09 18:29:11 -04:00
Mieszko Jędrzejczak
30299a0b6b hon hon, mon ami! 2016-07-09 21:56:17 +02:00
TheDZD
a144980bde Minor tweaks 2016-07-09 11:37:26 -04:00
Mieszko Jędrzejczak
5745099842 birb. 2016-07-09 11:24:00 +02:00
Fox McCloud
ec40944987 Merge pull request #4921 from Chakirski/green-glasses
Prescription Upgrade to Green Glasses & Syndi-Mesons
2016-07-08 18:00:27 -04:00
monster860
3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Kyep
dd8897fd22 Fixes merge conflict 2016-07-07 21:57:42 -07:00
Kyep
c8cede8916 Tiger 2016-07-07 21:53:44 -07:00
Fox-McCloud
9c3843092d fixes 2016-07-08 00:34:56 -04:00
TullyBurnalot
9821a7f757 Prescription Monocles
- Makes monocle prescription upgradable
- Adds monocles to Loadout options
2016-07-08 03:59:25 +01:00
Fox-McCloud
2e3d8bbbc6 Merge remote-tracking branch 'upstream/master' into hit-reactions 2016-07-07 22:50:53 -04:00
Fox-McCloud
17be7813b8 shielded hardsuits 2016-07-07 22:39:40 -04:00