cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-02-09 16:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,252 Commits 31 Branches 2 Tags
ceced8c832c7aa998f05aa2e207bc270df9744fd
Commit Graph

12031 Commits

Author SHA1 Message Date
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
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
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
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
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
Fox-McCloud
fc6514f5ba Merge remote-tracking branch 'upstream/master' into tg-weather 2016-07-16 11:07:43 -04:00
TheDZD
9bf946b5b6 Merge pull request #5054 from Fox-McCloud/mining-tweaks 
Various Mining Tweaks
 2016-07-16 10:57:54 -04:00
TheDZD
0d51787dbb Merge pull request #5072 from Fox-McCloud/belt-fixes 
Belt Overlay Fixes
 2016-07-16 10:44:01 -04:00
Fox McCloud
744777a944 Merge pull request #4971 from monster860/datum_browserify 
Makes a bunch of UI's use /datum/browser
 2016-07-16 08:52:18 -04:00
monster860
e32418956e open(0) 2016-07-16 08:27:37 -04:00
Fox McCloud
b76e2d19e0 Merge pull request #5041 from DaveTheHeadcrab/plastique_is_fun 
Plastic Explosives Update
 2016-07-16 04:07:12 -04:00
Fox-McCloud
7751adcffc Belt Overlay Fixes 2016-07-16 02:06:02 -04:00
Fox-McCloud
a1341f02af Sleeper Changes 2016-07-16 01:31:34 -04:00
Fox-McCloud
e6c02e3a2c Merge remote-tracking branch 'upstream/master' into mining-tweaks 2016-07-15 23:16:00 -04:00
Fox McCloud
7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins 
Crazypilot's Space Ruins Port
 2016-07-15 22:55:51 -04:00
Fox McCloud
aa2ff8ceea Merge pull request #4843 from FreeStylaLT/youpieceoffuckingshitforgottousemapmerger 
Good heavens look at the time it's SEC REMAP O' CLOCK
 2016-07-15 22:32:28 -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
Fox-McCloud
89cb267ae8 Can Scan Vending Machines with your PDA 2016-07-15 13:51:16 -04:00
Fox McCloud
5107bca5dd Merge pull request #4899 from FlattestGuitar/loadouts 
Did someone say "loadouts"?
 2016-07-15 11:25:34 -04:00
SamCroswell
e139f81412 PDA Slot Removal + PDA ID Changes 2016-07-15 00:54:14 -04:00
Fox McCloud
c3c9570d46 Merge pull request #5057 from Krausus/UsrTheSrcLuke 
Fixes ERT Creation
 2016-07-14 23:58:39 -04:00
Fox McCloud
66d7b89d9a Merge pull request #4838 from FalseIncarnate/paradise_pop 
Paradise Pop
 2016-07-14 23:58:24 -04:00
Fox McCloud
f7b298f68e Merge pull request #4895 from TullyBurnalot/ArmlessCuffs 
Armless Cuffing and Legless Legcuffing Sense-Making
 2016-07-14 23:30:38 -04:00
Krausus
dceb939539 Fixes ERT creation 
- src is now used instead of usr, where appropriate, meaning one single
person won't be used in the generation of ALL ERT members
- Creation is no longer blocked by input from members who are being
generated
- Members will no longer exist as a naked body until the moment they
finish picking their class
 2016-07-14 23:22:16 -04:00
Fox-McCloud
0fb2bfd8f1 Various Mining Tweaks 2016-07-14 22:07:04 -04:00
TullyBurnalot
c8801b2ff5 Adds sanity check for non-carbon mobs 2016-07-15 00:46:28 +01:00
Fox McCloud
4d3b818232 Merge pull request #5048 from Chakirski/bug1 
Cigpacks Examine Fix
 2016-07-14 18:54:23 -04:00
SamCroswell
23a1d887f3 Better Target Bugfix 2016-07-14 15:51:20 -04:00
Chakirski
6c8fa9f688 cigs... 2016-07-14 10:45:52 -05:00
Fox-McCloud
5216b39339 Ports TG's Weather System 2016-07-14 04:29:28 -04:00
SamCroswell
d0b818cc1b My commit line is a mess at this point IDGAF 2016-07-14 01:45:21 -04:00
SamCroswell
8b94d840fb PLEASE SEND HELP 2016-07-14 01:44:40 -04:00