cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-19 23:01:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,079 Commits 26 Branches 2 Tags
82b863cefdabb64cb15e03dd7978006390c0f3be
Commit Graph

1073 Commits

Author SHA1 Message Date
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
Couls
32bff777e8 in-hand sprites for lantern 2019-06-04 19:38:07 -04:00
Mark van Alphen
a90b23c271 Re-apply Lava staff fix 2019-06-04 03:46:16 +02:00
Mark van Alphen
75fa225155 Remove hood from necropolis chest 2019-06-04 00:38:41 +02:00
Mark van Alphen
cd362d6bad Wormhole jaunter fix (and replace lighting checks with simulated) and disk compartmentalizer fix 2019-06-03 21:44:01 +02:00
Mark van Alphen
bab051a084 Wormhole jaunter belt fix 2019-06-03 20:15:02 +02:00
Mark van Alphen
94eb652f15 Fix alarms triggering on non-contact levels, spectral blade ghost fix, assigning outfits runtime fix 2019-06-03 17:39:23 +02:00
CornMyCob
376c66db4d cursed heart fix 2019-06-03 16:02:45 +01:00
Couls
5979166f54 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-02 21:59:58 -04:00
Mark van Alphen
8822887784 Compile fix and asteroid turf placement fix 2019-06-03 01:21:03 +02:00
Mark van Alphen
697bb8eee5 More Lavaland fixes: 
- Air alarm computers will no longer display alarms that can't be remote controlled
- Survival capsules now have a NanoMed
- Fixed the disk compartmentalizer not having a sprite when something is put in
- Fixed the drying rack not having a sprite when something is put in
- Turned water bottles into glass containers so they have more functionality
- Hairless hide can now be made wet using water
- Reagents in glass containers can now be fed to others
 2019-06-02 23:29:50 +02:00
Mark van Alphen
c9e87f6593 Add more explosive power to Syndicate base, add species specific sprites for explorer equipment (thanks Ionward), fix Drake explosive sound, clarify ash walker/syndicate base personnel flavor text 2019-06-01 21:17:17 +02:00
datlo
ade8aeaf2f Allow free golems to purchase shuttle board 
also add a shuttle recalls console to ruin
 2019-06-01 11:51:35 +01:00