cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 15:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,098 Commits 26 Branches 2 Tags
d258c91c7f7875b8f0fa4d51158f099d2f05cf29
Commit Graph

2892 Commits

Author SHA1 Message Date
variableundefined
486f22ceb6 Merge pull request #11817 from Arkatos1/MalfButtons 
Malfunctioning AI upgrade - Action Buttons!
 2019-08-30 11:39:44 -04:00
Fox McCloud
2bdb6f448f Fixes Blooddrunk Buff 2019-08-29 22:12:02 -04:00
variableundefined
b75db54b1f Merge pull request #12015 from SteelSlayer/atmos-QoL 
Atmos tech QoL & Disposal pipe tweaks
 2019-08-28 11:14:17 -04:00
Fox McCloud
9f2f9cfa6c Merge remote-tracking branch 'upstream/master' into ports-tailoring 2019-08-27 18:23:11 -04:00
variableundefined
e6a190ae72 Merge pull request #12093 from Fox-McCloud/sandbags-and-barricades 
Adds Sandbags Reworks Security Barricades
 2019-08-27 18:01:20 -04:00
Arkatos1
6f32849938 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into MalfButtons 2019-08-27 22:33:29 +02:00
variableundefined
d277e0c78d Merge pull request #11673 from Arkatos1/Magic-With-Style 
Wizard Update - Magic with style
 2019-08-27 16:04:52 -04:00
datlo
9ec6c795d1 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into add-biodomes 2019-08-27 11:02:49 +02:00
Fox McCloud
eef0bc919d Implements Tailoring 2019-08-26 17:41:39 -04:00
Arkatos1
6b2add6eb9 Deconflict 2019-08-26 18:53:55 +02:00
variableundefined
97654f5d52 Merge pull request #11762 from AzuleUtama/vgFalseBriefcaseAndCompactRifle 
Ports VG's false briefcase
 2019-08-26 08:53:14 -04:00
Fox McCloud
1befa092be Adds Sandbags Reworks Security Barricades 2019-08-26 03:21:45 -04:00
Fox McCloud
f694b483cf include new outfit data 2019-08-25 18:25:52 -04:00
Fox McCloud
9a4834a565 Merge remote-tracking branch 'upstream/master' into hardsuit-helmet 2019-08-25 18:15:10 -04:00
Fox McCloud
dd346515e5 additional suits 2019-08-25 17:42:48 -04:00
Fox McCloud
85c6997584 Merge remote-tracking branch 'upstream/master' into plasmamen-rework 
# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	icons/obj/device.dmi
#	paradise.dme
 2019-08-25 16:51:21 -04:00
Fox McCloud
cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
variableundefined
5daf9a190b Merge pull request #11712 from Markolie/lazy 
Custom outfit manager and spawn with outfit on transform/reincarnate
 2019-08-24 12:27:48 -04:00
variableundefined
a968dc6a09 Merge pull request #11936 from farie82/antidrop-remove-on-drop 
Dropped anti drop items now lose the antidrop status if not initialized with it
 2019-08-24 10:53:23 -04:00
Shadow-Quill
acafb38c74 Minmax 
Sent from my iPhone.
 2019-08-23 02:05:03 -05:00
Shadow-Quill
0f5cc3b026 Done 2019-08-23 00:25:59 -05:00
datlo
28caad13f9 add winter/clown biodomes 2019-08-18 21:06:58 +02:00
Fox McCloud
9699beee82 Ports Crusher Trophies 2019-08-17 21:57:40 -04:00
Crazy Lemon
3313efed23 Merge pull request #11981 from Fox-McCloud/lavaland-update 
Major Lavaland Update
 2019-08-16 22:22:49 -06:00
variableundefined
9097eb0e1d Merge pull request #11741 from AzuleUtama/chameleonGlasses 
Traitor thermals and security HUD now use updated chameleon code, Slight buff to the thermals
 2019-08-13 12:06:39 +08:00
variableundefined
80921a3ba4 Merge pull request #11807 from Tayyyyyyy/ert_tweaks 
Randomized ERT priority + drag and drop role selection
 2019-08-13 08:43:22 +08:00
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
variableundefined
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 McCloud
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
datlo
d329f04ae6 Merge branch 'master' into lavalandgolemsintospace 2019-08-11 16:12:28 +02:00
variableundefined
ae70cbfe41 Merge pull request #11606 from Markolie/ghostqol 
Observer/hud improvements and fixes
 2019-08-11 16:23:23 +08:00
Fox McCloud
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
variableundefined
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
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
variableundefined
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
variableundefined
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