cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 14 Branches 2 Tags
dev-docs-readme
Commit Graph
4369 Commits
Author SHA1 Message Date
AzuleUtama f550b19f8d conflicts and reviews 2019-08-12 19:04:21 +01:00
AzuleUtama f19e8aa58a conflicts 2019-08-12 18:47:11 +01:00
Arkatos1 aa104810f2 Merge https://github.com/ParadiseSS13/Paradise into MalfButtons 2019-08-12 16:41:03 +02:00
Arkatos1 c9ccf56ebd Merge https://github.com/ParadiseSS13/Paradise into Magic-With-Style 2019-08-12 16:34:52 +02:00
variableundefinedandGitHub 98b821c120 Merge pull request #11637 from datlo/lavalandgolemsintospace 
Move free golems to lavaland, let them move shuttle still
 2019-08-12 17:42:40 +08:00
Fox McCloud 195d8a68ec final commit 2019-08-12 00:07:22 -04:00
Fox McCloud 52b37935f7 commit 2 2019-08-11 23:23:43 -04:00
Fox McCloudandGitHub 940f87b210 Merge pull request #11942 from Couls/clown-buff 
Waddling component, clowns can now choose to waddle while they walk, penguins automatically waddle
 2019-08-11 20:54:04 -04:00
Fox McCloud 39c9e9abde Reworks Plasmamen 2019-08-11 18:56:32 -04:00
datloandGitHub d329f04ae6 Merge branch 'master' into lavalandgolemsintospace 2019-08-11 16:12:28 +02:00
variableundefinedandGitHub ae70cbfe41 Merge pull request #11606 from Markolie/ghostqol 
Observer/hud improvements and fixes
 2019-08-11 16:23:23 +08:00
Fox McCloudandGitHub 6c8fe1d506 Merge pull request #11864 from Markolie/portalfix 
Portal fix
 2019-08-10 23:24:58 -04:00
Fox McCloud ee0447dad6 Major Lavaland Update 2019-08-10 22:36:55 -04:00
variableundefinedandGitHub c778b16e76 Merge pull request #11970 from datlo/traitorconflictfix 
Fix conflicting traitor objectives
 2019-08-10 20:27:20 +08:00
Mark van Alphen 14e8022daf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix 
# Conflicts:
#	code/game/objects/effects/step_triggers.dm
 2019-08-09 23:38:49 +02:00
datlo a408aea8f4 fix conflicting objs and double exchange docs 2019-08-08 10:30:05 +02:00
Couls 6ee8c0d96f Merge remote-tracking branch 'upstream/master' into zombies 2019-08-04 21:05:10 -04:00
SteelSlayer 4878d60a31 Atmos QoL updates 2019-07-31 00:53:54 -04:00
Couls 07dbf66a18 Waddling! 2019-07-29 03:16:18 -04:00
joep van der velden 402d1ef131 No drop items now lose their nodrop if dropped 2019-07-29 00:03:18 +02:00
Mark van Alphen 88fa0d27df Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport 
# Conflicts:
#	paradise.dme
 2019-07-15 20:30:54 +02:00
Mark van Alphen fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
variableundefinedandGitHub 5c325d33fe Merge pull request #11684 from IAmBigCoat/medbeamwarnings 
Added warnings to the medbeam gun re: stream-crossing
 2019-07-12 18:17:07 +08:00
variableundefinedandGitHub 36736277a1 Merge pull request #11358 from Couls/diagonal-movement 
[Ready for Testmerge] Implement Diagonal Movement
 2019-07-12 17:12:57 +08:00
Arkatos1 d946f497f4 Initial commit 2019-07-10 21:21:51 +02:00
Couls 2d7f2bb3c2 Code cleanup, spacing fixes 2019-07-09 08:11:43 -04:00
variableundefinedandGitHub 74a7b7ad55 Merge pull request #11566 from Arkatos1/locked 
Action Buttons - Lockdown
 2019-07-09 18:22:40 +08:00
tayyyyyyy bed6f9b0ef Drag and drop in ranked preferences input 2019-07-08 14:59:51 -07:00
tayyyyyyy 9d9bf046e3 Fix autocomplete input mishandling single quotes 2019-07-08 14:22:52 -07:00
Mark van Alphen 6c58f9fcbb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lazy 
# Conflicts:
#	paradise.dme
 2019-07-08 19:37:54 +02:00
Mark van Alphen d03f4dcafb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport 
# Conflicts:
#	paradise.dme
 2019-07-08 19:36:30 +02:00
Couls cee64d5c37 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-08 10:13:15 -04:00
variableundefinedandGitHub 3fdf53b180 Merge pull request #11593 from AzuleUtama/CyberBundleFix 
Makes Cybernetic Bundles a Nukie-only item again
 2019-07-08 20:21:47 +08:00
variableundefinedandGitHub fb15166fda Merge pull request #11570 from Tayyyyyyy/autocomplete 
Autocomplete input
 2019-07-08 20:21:22 +08:00
Couls a7b4e0b9ef Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-07 22:17:19 -04:00
variableundefinedandGitHub df199a651d Merge pull request #11663 from Markolie/maskofnarsie 
Remove traces of the Mask of Nar'Sie
 2019-07-07 22:10:02 +08:00
CoulsandGitHub 33d35eb625 Merge branch 'master' into diagonal-movement 2019-07-02 05:55:44 -04:00
AzuleUtama ab8c0f5aa5 Reverted compact rifle changes, false bottomed case now starts empty 2019-06-30 12:28:23 +01:00
variableundefinedandGitHub a189efe72d Merge pull request #11449 from Shadeykins/AI-Laws 
Changes Quarantine, NT Default, Aggressive, and Corporate AI Lawsets [REVIEW READY].
 2019-06-30 15:15:07 +08:00
variableundefinedandGitHub 497601245f Merge pull request #11496 from Markolie/cultthings 
Gives the night vision spell to cult constructs
 2019-06-30 14:35:32 +08:00
AzuleUtama fa2ca7c87c Ports VG false bottomed briefcase + compact sniper changes 2019-06-29 15:47:26 +01:00
Arkatos1 2dee61b3f4 Merge https://github.com/ParadiseSS13/Paradise into Magic-With-Style 2019-06-24 15:16:59 +02:00
AzuleUtama 9500df95d3 Traitor thermals and security HUD now use chameleon code 2019-06-22 14:06:07 +01:00
Couls e3a19841d9 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-22 03:54:43 -04:00
datlo 8894d88a82 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into lavalandgolemsintospace 2019-06-13 13:58:56 +01:00
Improvedname 24c2b0fd4f j 2019-06-10 19:53:03 +02:00
Mark van Alphen fea2b2532d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cultthings 
# Conflicts:
#	paradise.dme
 2019-06-09 23:28:41 +02:00
Mark van Alphen ef16165471 More outfit fixes 2019-06-09 23:27:06 +02:00
Mark van Alphen 3728e5efe4 More outfit improvements 2019-06-09 22:47:47 +02:00
Mark van Alphen f2e32dad07 Add accessory/internals box support, add cybernetic implants support to new outfit system 2019-06-09 22:21:25 +02:00