cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-15 10:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,611 Commits 14 Branches 2 Tags
52f263ba01db42ad2aa2700a7d1a1f7970fe1d59
Commit Graph

8191 Commits

Author SHA1 Message Date
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 adc33ef3a0 Merge pull request #11783 from Couls/on-hit-effects 
[READY] Add on-hit effects for lasers and bullet holes for walls from TG
 2019-08-16 07:50:49 +08:00
variableundefined f82adc1310 Merge pull request #11937 from farie82/Borgs-crate-rig-fix 
Rigging a crate now costs 15 coils instead of deleting your stack
 2019-08-16 00:33:20 +08:00
farie82 00d7eb7c3f Update crates.dm 2019-08-15 18:16:50 +02:00
variableundefined 34bb102a37 Merge pull request #11767 from Arkatos1/pillbottle 
New Medical Directive - Colored Pillbottles!
 2019-08-15 11:17:46 +08:00
variableundefined 9945c04f96 Merge pull request #11833 from dovydas12345/Chair 
Fixes being able to pick up chairs with full hands or without hands.
 2019-08-14 23:47:12 +08:00
Couls 7c5bdcc83c Merge remote-tracking branch 'upstream/master' into unrestricted-airlocks 2019-08-13 21:46:32 -04: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
Arkatos1 bddc7132c2 Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-08-12 16:36:43 +02:00
variableundefined f6505a6fd5 Merge pull request #11819 from Kyep/medals 
Department Medals
 2019-08-12 17:52:22 +08:00
variableundefined 2b53fb0ab3 Merge pull request #11392 from Citinited/airlock-spawners 
Airlock spawners 2: Electric Boogaloo
 2019-08-12 13:30:26 +08:00
Fox McCloud 5b43b9b836 Merge pull request #11934 from Ty-Omaha/remote-finger 
Adds hidden fingerprint to remote door uses
 2019-08-11 17:09:46 -04:00
variableundefined 0b04d71445 Merge pull request #11515 from Tayyyyyyy/sanitize 
Sanitize all inputs
 2019-08-11 22:09:10 +08:00
variableundefined 9eff8a8663 Merge pull request #11696 from Markolie/shuttlechairs 
Add shuttle chairs (and fix newlines on all maps)
 2019-08-11 16:32:14 +08:00
variableundefined ae70cbfe41 Merge pull request #11606 from Markolie/ghostqol 
Observer/hud improvements and fixes
 2019-08-11 16:23:23 +08:00
variableundefined 673d1c9f78 Merge pull request #11611 from farie82/blindfold-craftable 
Blindfolds are now craftable from 3 cloth
 2019-08-11 15:00:34 +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
Crazy Lemon ae27e39dec Merge pull request #11976 from Fox-McCloud/fix-dual-swords 
Fixes Sharpening Toy Swords
 2019-08-09 17:56:48 -06:00
Mark van Alphen 2ae1fc7ac2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs 
# Conflicts:
#	icons/obj/chairs.dmi
 2019-08-09 23:41:07 +02: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
Fox McCloud fdfbb8fd93 Fixes Sharpening Toy Swords 2019-08-09 16:36:04 -04:00
farie82 b4ed42155b return 2019-08-07 08:43:32 +02:00
Couls 75ed8566f5 Merge remote-tracking branch 'upstream/master' into on-hit-effects 2019-08-04 21:00:57 -04:00
joep van der velden b46e970327 Better fix now. Use 15 wires using use() 2019-07-29 00:31:22 +02:00
joep van der velden 2bddeb7fde Borgs can't rig crates anymore with cable coil 2019-07-29 00:08:35 +02:00
Ty-Omaha f5134a417d door remote logs 2019-07-28 17:49:04 -04:00
Couls 5427c5267c Merge branch 'master' into unrestricted-airlocks 2019-07-15 18:29:31 -04:00
Mark van Alphen 8c8950bf07 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2019-07-15 20:37:44 +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
tayyyyyyy 57c700a814 Sanitize all inputs 2019-07-14 09:35:12 -07:00
Arkatos1 47b447619a Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-07-12 19:40:59 +02:00
Dovixx 404bfe3768 Update chairs.dm 2019-07-12 18:00:01 +03: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
Kyep fd389810f2 medals in lockers 2019-07-10 20:13:14 -07:00
variableundefined e42e1af87a Merge pull request #11634 from Markolie/laborstacker 
Updates the prison labor point system
 2019-07-09 18:21:58 +08: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 742bc62c8b Merge pull request #11544 from Arkatos1/recharger 
Rechargers now show their contents and charge status on examine
 2019-07-08 20:18:36 +08:00
variableundefined 82a52969e2 Merge pull request #11525 from Citinited/rpd-radial-menu 
Adds a mini-radial menu to the RPD
 2019-07-08 17:33:46 +08:00
Couls a7b4e0b9ef Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-07 22:17:19 -04:00
variableundefined 93d9cd4e08 Merge pull request #11787 from JKnutson101/lattice_catwalk_fix 
Fixed a bug that prevented Catwalks and Lattice from returning materials
 2019-07-07 22:10:08 +08:00
unknown 8aa5bbdb9c removed unnecessary == TRUE 2019-07-06 14:26:42 -04:00
unknown 25f68f2e41 Removed a line that prevented Catwalks and Lattice from returning materials 2019-07-04 16:17:32 -04:00
Couls 3782dbfc16 Add on-hit effects and bullet holes for walls 2019-07-03 22:17:35 -04:00
Couls 33d35eb625 Merge branch 'master' into diagonal-movement 2019-07-02 05:55:44 -04:00
Couls 4c0c7aa750 can now build unrestricted airlocks 2019-07-01 21:44:16 -04:00