cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 13 Branches 2 Tags
dev-docs-readme
Commit Graph
4369 Commits
Author SHA1 Message Date
Markolie c4f7730764 Additional TEG changes 2016-10-12 14:00:02 +02:00
Fox McCloudandGitHub dfde050407 Merge pull request #5644 from GeneralChaos81/Conveyors 
Port of TGs conveyors
 2016-10-11 20:27:46 -04:00
Markolie a577cd206c TEG refactor 2016-10-11 22:49:51 +02:00
TheDZDandGitHub 0b227c3d5b Merge pull request #5646 from Fox-McCloud/grenade-tweak 
Atmos Grenade Balance
 2016-10-10 20:54:23 -04:00
Mieszko Jędrzejczak a64f1849c0 Actually fixes the implants this time 2016-10-10 12:51:56 +02:00
Fox McCloudandGitHub 230ec7603d Merge pull request #5750 from FlattestGuitar/nukiefix 
Fixes nukie cyberimplants being free
 2016-10-09 12:31:14 -04:00
Aurorablade e2ce799aa1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-08 22:21:48 -04:00
Aurorablade 864a9ba612 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-10-07 23:51:48 -04:00
FlattestGuitar 7592c65fe0 ❄️ ❄️ ❄️ ❄️ ❄️ ❄️ ❄️ ❄️ ❄️ 2016-10-07 20:13:24 +02:00
Fox McCloudandGitHub 3201ea3ccb Merge pull request #5738 from FlattestGuitar/fix 
adds logs to missionary stuffs
 2016-10-04 08:36:16 -04:00
FlattestGuitar 03cc776d40 moves the stuffs to mind.dm 2016-10-04 13:58:30 +02:00
Fox McCloudandGitHub 26fe47faa7 Merge pull request #5638 from theColdflame/10mmuplink 
Adds 10mm variants to the syndicate uplink.
 2016-10-02 10:48:32 -04:00
KasparoVy 3e653a6279 Conflict resolution. 2016-09-26 12:17:35 -04:00
theColdflame bd73e58d60 description 2016-09-26 04:43:10 +01:00
Aurorablade dee83ef62e ALL HAIL LEMONS 2016-09-22 02:00:04 -04:00
Aurorablade 2b19b81b99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-09-17 01:38:02 -04:00
Aurorablade fd9d6d8c71 ui stuff then map conflicts 2016-09-16 00:45:37 -04:00
theColdflame aaa08f2189 adds unique references 2016-09-12 21:38:09 +01:00
Fox-McCloud 12d23a061f tweak 2 2016-09-12 14:32:10 -04:00
Aurorablade f1aada7ea1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-09-11 19:50:53 -04:00
Fox-McCloud 9a0b8b7c39 Atmos Grenade Balance 2016-09-09 13:53:53 -04:00
GeneralChaos81 4af47209ae Removed all the commented sections after testing. 2016-09-09 17:53:11 +10:00
GeneralChaos81 010293bbf8 Port of TGs buildable conveyors. We can finally repair broken conveyors! 2016-09-09 16:35:08 +10:00
Krausus b0ac462166 Integrates UIDs into View Variables 2016-09-08 19:04:50 -04:00
theColdflame 9292c4b304 adds 10mm variants to uplink 
fixes typo

fixes extra line

fixes HP uplink name

don't code at 1am
 2016-09-08 10:55:07 +01:00
Krausus 92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
KasparoVy 1373070b98 More Conflict Resolution 2016-09-03 21:29:10 -04:00
Mieszko Jędrzejczak 42e73f0e24 Makes TP formatting nicer 2016-09-01 16:25:26 +02:00
Aurorablade 2c104adaf3 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-09-01 00:43:50 -04:00
Fox McCloudandGitHub 53893e2b57 Merge pull request #5571 from TheDZD/why-the-fuck-was-this-fucking-proc-made-with-the-fucking-args-backwards-of-literally-every-other-fuckmothering-codebase 
add_logs() Un-fuckery
 2016-08-29 19:36:56 -04:00
TheDZD f5577b4a8f add_logs() un-fuckery 2016-08-29 17:27:56 -04:00
TheDZDandGitHub 67d114381b Merge pull request #5553 from Crazylemon64/improved_vv 
Faster VV, VV by ref
 2016-08-27 22:25:14 -04:00
Aurorablade 767b4d3c3d will rework the map changes later... 2016-08-26 21:57:52 -04:00
Aurorablade 65d1c781c8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-26 21:54:56 -04:00
Aurorablade 8c8e7eeaa8 REALLY?! 2016-08-26 21:54:21 -04:00
Fox McCloudandGitHub 4f590f27c4 Merge pull request #5537 from Crazylemon64/debug_log_to_error_viewing 
Moves from `log_debug` to `log_runtime` for non-fatal abberant states
 2016-08-26 21:15:31 -04:00
Aurorablade 59262c49f5 insert middle finger here.. 2016-08-26 20:52:48 -04:00
Aurorablade f964277919 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub 2016-08-26 20:30:28 -04:00
Crazylemon64 50e0a9ee27 Adds a "VV by ref" proc to let people VV by a ref string 
Also moves "Toggle debug verbs" from mapping.dm to its own file,
because that last place made no sense for it
 2016-08-26 16:29:46 -07:00
Crazylemon64 4f56a0ea12 VV now uses .Join to form its HTML, making it much faster 2016-08-26 15:54:13 -07:00
KasparoVy cd9b12086b Merge remote-tracking branch 'upstream/master' into repathing-sprite-accessories 2016-08-26 02:28:47 -04:00
Krausus 9bba0a7342 Changeling Swap Form-related fixes 2016-08-25 04:24:27 -04:00
Aurorablade b551345b73 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-24 20:49:20 -04:00
Crazylemon64 16dd4e9d21 Moves many uses of log_to_dd to log_runtime, to make the output 
more visible at runtime, to someone who isn't watching DD first-hand
 2016-08-24 09:55:19 -07:00
Crazylemon64 b633cf53af Moves from log_debug to log_runtime for non-fatal abberant states 2016-08-23 17:03:52 -07:00
TheDZDandGitHub 961d93d91c Merge pull request #5509 from Fox-McCloud/mining-shelter 
Ports Mining Shelters
 2016-08-23 14:03:54 -04:00
Aurorablade 080c02af87 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-23 00:53:31 -04:00
Fox-McCloud 8cd6e58c07 updates 2016-08-21 11:44:54 -04:00
Fox-McCloud 9429949619 Mining Area Tweak 2016-08-21 06:10:51 -04:00
KasparoVy 9bc614a28e Conflict resolution and adds sanitization to marking SQL handling. 2016-08-21 00:01:12 -04:00