cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 10:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,190 Commits 26 Branches 2 Tags
4826ea13f85dc9c7d1fcb43f374e69ccdfef2af2
Commit Graph

2707 Commits

Author SHA1 Message Date
Couls
a8db26df98 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-04-25 23:45:08 -04:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Couls
4921405749 make clients inherit from datums 2019-04-23 19:55:17 -04:00
variableundefined
624699e6d9 Merge pull request #11332 from Arkatos1/VarArts 
Adds an option to grant Martial Arts via Var menu
 2019-04-23 20:47:03 +08:00
Couls
09ba03857b Remove repeat defines and fix focus 2019-04-23 06:27:21 -04:00
Couls
40729f2862 spessing and fix compile errors 2019-04-23 02:01:57 -04:00
Couls
7eb7d723f9 Implement keybinding system and remove old hotkey modes 2019-04-23 01:31:03 -04:00
Fox McCloud
4761ded0d4 Merge pull request #11350 from AffectedArc07/ss-everything 
Gives the orphans a home
 2019-04-21 18:44:38 -04:00
AffectedArc07
ff78ff1a9c SScommunications 2019-04-21 20:12:14 +01:00
Arkatos1
cb8e492746 Code improvement 2019-04-19 17:41:25 +02:00
Arkatos1
b0182639b2 Adds an option to grant Martial Arts via Var menu 2019-04-19 16:54:59 +02:00
variableundefined
31a2779bae Merge pull request #11259 from Markolie/flukeops 
Nuke Ops updates and buffs
 2019-04-18 07:16:31 +08:00
variableundefined
eb83a2dee7 Merge pull request #11285 from Fox-McCloud/elecrocution-refactor 
Refactors Electrocution
 2019-04-16 19:47:42 +08:00
Crazy Lemon
6c4eb66da8 Merge pull request #11282 from Fox-McCloud/atmos-defines 
Atmos Define Cleanup + Plasma Tweaks
 2019-04-10 22:18:52 -07:00
Fox McCloud
90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00
Crazy Lemon
1a57f440df Merge pull request #11257 from Fox-McCloud/nations-update 
The Nations Update Everyone Deserves!
 2019-04-09 20:47:34 -07:00
Fox McCloud
a615e2bf3c forgot this hud. 2019-04-09 23:28:19 -04:00
Fox McCloud
e11b15fe7f Merge pull request #11270 from TDSSS/nukie-hijack 
Lets nukies buy plasmagrenades again (and other hijack gear)
 2019-04-09 22:47:26 -04:00
Fox McCloud
06713d604f Atmos Define Cleanup + Plasma Tweaks 2019-04-09 11:22:01 -04:00
Fox McCloud
03d894ecfc Merge remote-tracking branch 'upstream/master' into fix-cqc 
# Conflicts:
#	code/game/objects/items.dm
 2019-04-07 19:54:14 -04:00
TDSSS
106b242770 Let's fix that too 2019-04-07 23:19:11 +02:00
TDSSS
e12653306a Thought of a better way to do it (probably 2019-04-07 23:16:54 +02:00
Crazy Lemon
b59a5d37b6 Merge pull request #11266 from Markolie/hotkeymode 
Fix Hotkey Toggle button
 2019-04-07 14:16:06 -07:00
TDSSS
6079cb1839 allows nukies to buy hijack items 2019-04-07 23:12:15 +02:00
Mark van Alphen
ddc3a02ab3 Fix thermal for saboteur, reinforcement bugfix, re-add C4 pack 2019-04-07 23:04:43 +02:00
Mark van Alphen
16dd2860f4 Remove debug and re-add spawning as a cyborg 2019-04-07 22:42:04 +02:00
Mark van Alphen
f63b587f54 Nuke ops updates 2019-04-07 21:57:22 +02:00
Mark van Alphen
721760c002 Remove debug 2019-04-07 18:43:45 +02:00
Mark van Alphen
91e6cb9347 Fix hotkey mode button 2019-04-07 18:42:08 +02:00
variableundefined
fc616d8a19 Merge pull request #11242 from Markolie/hotkeymode 
Hotkey mode handling is now instantaneous
 2019-04-07 21:21:21 +08:00
variableundefined
996f26508e Merge pull request #11240 from Arkatos1/Carp_Change 
Changes Dehydrated Space Carp TC cost from 3 to 2
 2019-04-07 21:20:39 +08:00
variableundefined
2ab55adfc2 Merge pull request #11244 from Arkatos1/Action_Tooltip 
Descriptions now show with a mouse hover over action buttons
 2019-04-07 21:20:20 +08:00
variableundefined
53d64d818d Merge pull request #11225 from TDSSS/box-revolver 
Trick revolver comes in a box.
 2019-04-07 21:14:51 +08:00
Fox McCloud
8446632fbc The Nations Update Everyone Deserves! 2019-04-06 20:30:04 -04:00
Mark van Alphen
aa58a88296 Switch to client-side hotkey toggling 2019-04-05 22:45:05 +02:00
Arkatos1
52a051f7e9 Code improvement 2019-04-05 20:13:13 +02:00
Arkatos1
a364d2d032 Descriptions now shows with mouse hover over action buttons 2019-04-05 20:11:41 +02:00
Arkatos1
e290523290 Changes Dehydrated Carp TC cost from 3 to 2 2019-04-05 18:25:08 +02:00
variableundefined
cc831667cd Merge pull request #11081 from Kyep/hijack_limits 
Syndie Uplink changes (better interface, hijack-only firegrenades)
 2019-04-04 09:30:56 +08:00
TDSSS
2ba5ec0228 fake revolver kit creation 2019-04-03 20:43:55 +02:00
variableundefined
449baf808b Merge pull request #11170 from Fox-McCloud/trick-revolver 
Adds Trick Revolver
 2019-04-02 18:33:24 +08:00
variableundefined
b7c787b113 Merge pull request #11199 from Fox-McCloud/fixes-bees 
Fixes Bees
 2019-04-02 18:26:45 +08:00
variableundefined
7a9d733840 Merge pull request #11197 from Arkatos1/Antag_Sounds_Update 
Tweaks to the Antagonist sound themes
 2019-04-02 18:26:05 +08:00
Fox McCloud
2bbba89480 Merge pull request #11169 from Arkatos1/Blob_QoL_Update 
Blob QoL Update and Rebalance
 2019-04-01 18:11:37 -04:00
Fox McCloud
ce3d4789ad Merge pull request #11153 from farie82/spontaneous-comb-fix 
Spontaneous combustion now has a minimal stack of 1 it applies
 2019-04-01 17:27:29 -04:00
Fox McCloud
e487b8b58e gosh dang 2019-04-01 16:22:20 -04:00
variableundefined
b0f64016a9 Merge pull request #11158 from Fox-McCloud/delayed-gibbing 
Makes Delayed Gibbing a Proc
 2019-04-01 23:07:17 +08:00
Arkatos1
5bb8b5759e Added antag sounds themes when adding antags via traitor panel, added cult theme for new cult converts and added traitor/malf theme for autotraitored crew/ai 2019-04-01 02:46:48 +02:00
Arkatos1
8669ea1716 Removed Dark Matter for real, improved descriptions and added Blob Overminds to Check Antagonists verb 2019-03-30 15:00:12 +01:00
Fox McCloud
f70ecb4387 Adds Trick Revolver 2019-03-29 23:33:46 -04:00