cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-11 14:21:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph

4852 Commits

Author SHA1 Message Date
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
Mark van Alphen 8d91925e1f Add blooddrunk ruins 
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com>
 2019-04-04 22:23:01 +02:00
Mark van Alphen a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2019-04-04 22:04:55 +02:00
Mark van Alphen 33d6017e28 Merge branch 'turfs' of https://github.com/Markolie/Paradise into turfs 2019-04-04 22:01:50 +02:00
Mark van Alphen 877cfc4d7d Refactor catwalks to not be floors, update chasms and fix Lavaboat 2019-04-04 22:01:25 +02:00
Mark van Alphen d077138c3d Merge pull request #4 from CornMyCob/turfs 
blood drunk miner
 2019-04-04 21:41:45 +02:00
CornMyCob e02087d474 blood drunk miner 2019-04-04 20:34:26 +01:00
Mark van Alphen 99c470531f Add Swarmer megafauna/ruin, refactor medals so it's a subsystem. The catwalk's not yet functional 2019-04-04 17:43:15 +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
Mark van Alphen 500675be77 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/structures/safe.dm
 2019-04-02 00:54:49 +02: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
Mark van Alphen f75de97c6e Port over Corn and affected's work on Lavaland 
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com>
Co-authored-by: CornMyCob <xxxxbarryscottxxxx@gmail.com>
 2019-04-01 23:41:32 +02: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
Mark van Alphen 57366118af Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 2019-04-01 17:55:37 +02: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
Mark van Alphen ce434df396 Fix disease path 2019-04-01 00:47:28 +02:00
Mark van Alphen ed153d3566 Add seed vault and animal hospital 2019-03-31 23:49:18 +02:00
Mark van Alphen 1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
Mark van Alphen bf68f966b1 Add Ash Walkers, work on Syndicate base 2019-03-31 04:33:39 +02:00
Mark van Alphen a05b37c5ca General Lavaland fixes, add Hierophant ruin 2019-03-31 01:12:10 +01:00
Mark van Alphen ceceb9f3b3 Largely finish up beach ruin 2019-03-31 00:20:27 +01:00
Mark van Alphen 45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
 2019-03-30 22:55:09 +01:00
Mark van Alphen f92be2c67d Add Beach biodome ruin and other fixes 2019-03-30 22:48:11 +01:00
Mark van Alphen 2047825165 Finish up Lavaland map 2019-03-30 21:08:33 +01: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
Mark van Alphen c370e08233 Port the actual Lavaland map (and associated fixes) 2019-03-30 04:12:37 +01:00
variableundefined 456320cbe0 Merge pull request #11144 from Fox-McCloud/chem-dispenser-refactor 
Chem Dispenser Refactor
 2019-03-29 20:28:14 +08:00
Fox McCloud 35758db699 Makes Delayed Gibbing a Proc 2019-03-28 20:34:20 -04:00
farie82 b228aab0cf Update fire.dm 2019-03-28 23:00:43 +01:00
Fox McCloud a5403c192a fixed errors 2019-03-28 17:54:39 -04:00
Fox McCloud d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
joep van der velden 407f867b14 Min stacks now is 1 2019-03-28 10:12:32 +01:00