cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 10:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,379 Commits 26 Branches 2 Tags
a3eee4b6cb045c2c2b51b757387c489bf13b8b04
Commit Graph

885 Commits

Author SHA1 Message Date
Fox McCloud
2bdb6f448f Fixes Blooddrunk Buff 2019-08-29 22:12:02 -04:00
variableundefined
549e6ee72e Merge pull request #12105 from Fox-McCloud/ports-tendril-loot 
Adds Book of Babel and Jacob's Ladder
 2019-08-29 20:43:18 -04:00
Fox McCloud
a70084a63f makes it so you can actually get the items 2019-08-27 18:49:25 -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
Fox McCloud
a4f187ac38 Adds Book of Babel and Jacob's Ladder 2019-08-27 16:04:54 -04:00
Fox McCloud
1befa092be Adds Sandbags Reworks Security Barricades 2019-08-26 03:21:45 -04:00
Fox McCloud
899eb9c948 Ports Jetpack Upgrades. Removes Jetpack Suit Storage 2019-08-26 00:11:42 -04:00
Fox McCloud
9a4834a565 Merge remote-tracking branch 'upstream/master' into hardsuit-helmet 2019-08-25 18:15:10 -04:00
Fox McCloud
855c8b3a98 derp 2019-08-25 15:18:07 -04:00
Fox McCloud
cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
Fox McCloud
9b9d5461ef Re-organizes Lavaland Files; Makes some Balacne tweaks 2019-08-24 03:58:05 -04:00
Fox McCloud
89f273414e Merge pull request #12057 from TDSSS/mining-hardsuit-fix 
Mining hardsuit fix
 2019-08-22 23:30:03 -04:00
TDSSS
79c6f1f078 I'm a dummy and can't copy-paste right 2019-08-23 03:32:04 +02:00
TDSSS
c4b944ad13 spacing 2019-08-23 03:28:36 +02:00
TDSSS
3540ab2bfc Makes mining hardsuits come with helmets again 2019-08-23 03:26:43 +02:00
variableundefined
07e9cf10a3 Merge pull request #12024 from Fox-McCloud/crusher-trophies 
Ports Crusher Trophies
 2019-08-22 18:55:54 -04:00
Fox McCloud
01a68b8895 Ports TG's Fultons 2019-08-18 18:22:07 -04: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
Fox McCloud
e2f7f6f055 science radio 2019-08-16 23:58:27 -04: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
84d01f44ce Merge pull request #11889 from Couls/hecking-orebox 
Automatically offload ore to orebox when pulling one
 2019-08-11 16:51:05 -04:00
Fox McCloud
f9c0fd2d25 fixes 2019-08-11 15:33:00 -04:00
datlo
d329f04ae6 Merge branch 'master' into lavalandgolemsintospace 2019-08-11 16:12:28 +02:00
variableundefined
0b04d71445 Merge pull request #11515 from Tayyyyyyy/sanitize 
Sanitize all inputs
 2019-08-11 22:09:10 +08:00
variableundefined
b3b29b40be Merge pull request #11666 from CornMyCob/cursed-heart-fix 
cursed heart fix
 2019-08-11 16:34:15 +08:00
Fox McCloud
ee0447dad6 Major Lavaland Update 2019-08-10 22:36:55 -04: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
Fox McCloud
f1899f0050 Merge pull request #11697 from Markolie/tribalhealing 
Add tribal splints, ash walker tweaks and Lavaland tweaks
 2019-08-09 17:22:22 -04:00
Couls
ce7e7be3d5 Automatically offload ore to orebox when pulling one 2019-07-18 18:29:15 -04: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
tayyyyyyy
57c700a814 Sanitize all inputs 2019-07-14 09:35:12 -07: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
variableundefined
e42e1af87a Merge pull request #11634 from Markolie/laborstacker 
Updates the prison labor point system
 2019-07-09 18:21:58 +08:00
variableundefined
8d19990013 Merge pull request #11805 from Markolie/fix321 
Survival pod storage wrench fix
 2019-07-09 16:13:48 +08:00
Mark van Alphen
22693b4a70 Survival pod storage wrench fix 2019-07-08 22:08:59 +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
variableundefined
756e48388a Merge pull request #11683 from Couls/lantern 
in-hand sprites for lantern
 2019-07-08 20:25:49 +08:00
Couls
a7b4e0b9ef Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-07 22:17:19 -04:00
variableundefined
fe6ba72462 Merge pull request #11706 from improvedname/explorersuit 
Explorer suits now will properly hide tails
 2019-07-07 22:10:35 +08:00
Couls
e3a19841d9 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-22 03:54:43 -04:00
Aurorablade
23666534dc Fixes an oversight in laz injectors 2019-06-14 01:54:07 -04:00
datlo
8894d88a82 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into lavalandgolemsintospace 2019-06-13 13:58:56 +01:00
Mark van Alphen
6235f464fe Re-add ash flora ex_act 2019-06-08 21:23:45 +02:00
Improvedname
4db6530728 hide tailo 2019-06-08 17:05:32 +02:00
Mark van Alphen
ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
Mark van Alphen
3381aaf287 Anchor ash flora 2019-06-06 02:16:52 +02:00
Mark van Alphen
cdaeb5d59c Fix ancient goliath tentacles and processing computer on Lavaland 2019-06-05 23:14:39 +02:00