cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 14 Branches 2 Tags
dev-docs-readme
Commit Graph
7135 Commits
Author SHA1 Message Date
variableundefinedandGitHub 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
AzuleUtama f550b19f8d conflicts and reviews 2019-08-12 19:04:21 +01:00
Arkatos1 bddc7132c2 Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-08-12 16:36:43 +02:00
variableundefinedandGitHub f6505a6fd5 Merge pull request #11819 from Kyep/medals 
Department Medals
 2019-08-12 17:52:22 +08:00
Fox McCloud 6a7fc31d83 woops, forgot this 2019-08-12 00:09:27 -04:00
Fox McCloud 39c9e9abde Reworks Plasmamen 2019-08-11 18:56:32 -04:00
Fox McCloudandGitHub 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
variableundefinedandGitHub 0b04d71445 Merge pull request #11515 from Tayyyyyyy/sanitize 
Sanitize all inputs
 2019-08-11 22:09:10 +08:00
variableundefinedandGitHub 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
variableundefinedandGitHub ae70cbfe41 Merge pull request #11606 from Markolie/ghostqol 
Observer/hud improvements and fixes
 2019-08-11 16:23:23 +08:00
variableundefinedandGitHub 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 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
Crazy LemonandGitHub 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 McCloudandGitHub 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
Couls 6ee8c0d96f Merge remote-tracking branch 'upstream/master' into zombies 2019-08-04 21:05:10 -04:00
FreeStylaLT 469dba4067 Minor optimization and comments 2019-08-04 01:02:30 +03:00
FreeStylaLT 2a0a0769b0 spacing and fixes the spam-self-attack exploit with the picker 2019-08-02 18:19:56 +03:00
FreeStylaLT 7153552297 Magic strings to defines, adds a GLOB list for the beacons 2019-08-02 17:40:37 +03:00
FreeStylaLT e0166fa7be and fixes the picker emitting the item / mob destruction messages 2019-08-02 16:12:10 +03:00
FreeStylaLT 0bc40f478e and fixes cancel not working 2019-08-02 16:04:31 +03:00
FreeStylaLT 77ff8394b5 removes a redundant switch 2019-08-02 15:57:44 +03:00
FreeStylaLT de5b2f7d6e adds the actual .dm oops 2019-08-02 14:43:26 +03:00
FreeStylaLT c190c814ad adds the enginepicker 2019-08-02 14:36:31 +03:00
joep van der velden 47a63e3a51 Added a few tips and fixed a bug 2019-07-29 01:42:51 +02:00
Ty-Omaha f5134a417d door remote logs 2019-07-28 17:49:04 -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
Couls bf161edfeb grammar 2019-07-11 19:36:25 -04:00
Kyep fd389810f2 medals in lockers 2019-07-10 20:13:14 -07:00
Couls a8a9e8e022 Baseball! 2019-07-10 21:12:35 -04:00
variableundefinedandGitHub 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
variableundefinedandGitHub 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
variableundefinedandGitHub 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
unknown 8aa5bbdb9c removed unnecessary == TRUE 2019-07-06 14:26:42 -04:00
unknown ded7e4be67 fixed a bug where construction permits deleted themselves prematurely 2019-06-30 20:49:37 -04:00
Arkatos1 de9da04572 Standardized colors, finished change wrapper choosing and modified templates and their sizes 2019-06-30 19:46:13 +02:00
Arkatos1 16a81d2527 Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-06-30 16:09:38 +02:00
Arkatos1 d33d018e62 Finished colors for other prespawned pillbottles, new colors, finished template for changing wrappers in chemmaster 2019-06-30 16:08:33 +02:00
AzuleUtama ab8c0f5aa5 Reverted compact rifle changes, false bottomed case now starts empty 2019-06-30 12:28:23 +01:00
AzuleUtama fa2ca7c87c Ports VG false bottomed briefcase + compact sniper changes 2019-06-29 15:47:26 +01:00
AzuleUtama dbed990412 Revert "Ports false-bottomed briefcase from VG" 
This reverts commit 3c5cf391b3.
 2019-06-29 15:10:41 +01:00
AzuleUtama 62af5597d3 Merge remote-tracking branch 'upstream/master' 2019-06-29 15:10:27 +01:00