Commit Graph

12118 Commits

Author SHA1 Message Date
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
eb2aec4db7 Merge pull request #5090 from Fox-McCloud/mob-death-refactor
Refactors Simple Animal Death and Implements Spawners
2016-07-21 10:08:25 -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
Fox McCloud
3d81909221 Merge pull request #5141 from monster860/datum_browserify
Fix brig timer cell ui opening multiple times after being closed.
2016-07-21 09:35:07 -04:00
TheDZD
c8dae2d7b5 Merge pull request #5092 from Fox-McCloud/powerfist
Ports Powerfist
2016-07-21 09:27:07 -04:00
monster860
7d9bde0f8a Fix brig timer cell ui opening multiple times after being closed. 2016-07-21 09:25:33 -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
TheDZD
a58245e109 Merge pull request #5131 from Fox-McCloud/cleanup
Cleans up Vars
2016-07-21 09:16:03 -04:00
Fox-McCloud
5fdad7355b more OOP 2016-07-21 06:33:39 -04:00
Fox-McCloud
0a8dca713c proper ear damage proc 2016-07-21 04:24:12 -04:00
Fox-McCloud
00a470fd6d removes stupid sdisabilities 2016-07-21 02:24:54 -04:00
Fox McCloud
6d0a0ad5c2 Merge pull request #5130 from Crazylemon64/disposal_fix
Fixes Various Machine Processing Fails
2016-07-21 02:19:17 -04:00
Fox-McCloud
1ac09a962c Cleans up Vars 2016-07-21 01:43:16 -04:00
Crazylemon64
0b121f7f7f Last roundup of machinery that didn't initialize right 2016-07-20 21:37:33 -07:00
Krausus
487e64a3cd Fixes camera monitor access checking 2016-07-20 23:39:44 -04:00
Fox McCloud
1c3e2c52b1 Merge pull request #5061 from CrAzYPiLoT-SS13/view_count
Adds a view count to newscaster feeds and messages
2016-07-20 22:31:09 -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
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
Tigercat2000
6650991be1 Tank action buttons now toggle the tank 2016-07-19 20:34:50 -07:00
Fox-McCloud
517f294beb more tweaks 2016-07-19 23:09:34 -04:00
Fox-McCloud
337e0c2896 DERP 2016-07-19 17:31:40 -04:00
Fox-McCloud
a58c85941b More Reagent Refactoring 2016-07-19 14:06:41 -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
Fox McCloud
a28ae804b9 Merge pull request #5086 from FreeStylaLT/assholewizards
Makes Wizards get only a special "fuck their shit up" objective
2016-07-18 20:03:57 -04:00
TheDZD
3901b47c0c Merge pull request #5087 from Fox-McCloud/wiznerd-fix
Fixes Wizard Satchel Equipping (And Spellbook tweak)
2016-07-18 20:02:44 -04:00
TheDZD
bd7157cf44 Merge pull request #5064 from DaveTheHeadcrab/personal_crafting
Personal Crafting
2016-07-18 19:54:31 -04:00
Crazy Lemon
fd486d3924 Fixes abductor console linking (#5098) 2016-07-18 19:51:12 -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
Mateja Milosevic
4591477a89 Conflicts and a fix 2016-07-18 20:50:30 +02:00
TheDZD
5c29bf3a64 Merge pull request #5074 from Fox-McCloud/adminbus-reagent
Tweaks Adminordrazine, Cleans up Reagents, Fixes body temperature adjustments, and makes a few tweaks
2016-07-18 14:41:45 -04: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
Fox-McCloud
b9489589b4 Refactors Simple Animal Death and Implements Spawners 2016-07-18 04:13:56 -04:00
TheDZD
4c2ee0c40a Merge pull request #5062 from Fox-McCloud/pda-scanning-vending
Can Scan Vending Machines with your PDA
2016-07-17 21:41:49 -04:00
Fox McCloud
91d5032a86 Merge pull request #5083 from Kyep/objective_fix
Prevents objectives targeting clientless mobs
2016-07-17 13:49:18 -04:00
Fox-McCloud
38b0bdba08 Fixes Wizard Satchel Equipping (And Spellbook tweak) 2016-07-17 11:26:01 -04:00
FreeStylaLT
deccfd6a24 Replaces hijack with an open-ended objective to wreck some shit up 2016-07-17 16:40:54 +03:00
FreeStylaLT
45df59e091 Makes Wizards only get Hijack objective 2016-07-17 15:42:27 +03:00
Fox-McCloud
7bdf89e37c Merge remote-tracking branch 'upstream/master' into sleeper-changes 2016-07-17 01:34:43 -04:00
Fox-McCloud
f0b8d3b097 more cleanup 2016-07-17 00:44:58 -04:00
Kyep
2f66464726 Prevents objectives targeting clientless mobs
Fixes bug where clientless mobs (e.g: gateway NPCs) can be made into
objective targets.
2016-07-16 20:21:12 -07:00
Fox-McCloud
a4619fbd38 clean up 2016-07-16 23:11:32 -04:00
SamCroswell
15a8b1d7d6 Merge Conflict Resolution 2016-07-16 18:47:18 -04:00
TullyBurnalot
bf42990e1b - Fixes explosions and AI Fixers
- AI Fixer cannot be screwdrivered if it's normal, or has no power
- AI Fixer can be screwdrivered if it's broken via an explosion with an
AI inside. This, of course, kills the AI
2016-07-16 18:05:42 +01:00
TheDZD
68e26f3176 Merge pull request #5045 from Fox-McCloud/tg-weather
Ports TG's Weather System
2016-07-16 12:04:17 -04:00
Fox McCloud
0653bff9c5 Merge pull request #4965 from TullyBurnalot/RemoteViewFix
Remote View Bug Fix
2016-07-16 11:40:14 -04:00
Fox McCloud
cb0973346b Merge pull request #4766 from Kyep/parole
Parole
2016-07-16 11:35:37 -04:00