cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 08:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,973 Commits 26 Branches 2 Tags
0bb62ebb367e3262d3e080618f68cb39badfb4be
Commit Graph

1764 Commits

Author SHA1 Message Date
Aurorablade
c5e6c9323b addresses mrrowl comments 
still haveing shuttle load issues after first one is loaded..
 2016-12-11 23:11:21 -05:00
Aurorablade
2dc1a48f35 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-12-01 22:38:35 -05:00
KasparoVy
e06218371f Sharper character creation preview images, tails/body accessories now show up in ID photos. 2016-11-25 17:55:57 -05:00
KasparoVy
fae398ae42 Replaces \blue and \red with spans, removes unnecessary SRCs and :s, Fixes Negative Cable Coil Bug 2016-11-13 18:16:37 -05:00
Fox McCloud
911fa70e1a Merge pull request #5601 from Crazylemon64/status_effect_overhaul 
Ports over the status effect unification from the extreme refactor
 2016-10-30 22:40:24 -04:00
Fox McCloud
f67bccb444 Merge pull request #5764 from Markolie/teg2 
TEG refactor
 2016-10-30 19:56:26 -04:00
TheDZD
eb21043b9a Merge pull request #5815 from Fox-McCloud/food-refactor 
Food refactor
 2016-10-28 22:37:19 -04:00
Fox-McCloud
7ca1330749 further tweaks 2016-10-25 16:46:41 -04:00
Fox McCloud
45ba4d157a Merge pull request #5416 from KasparoVy/tail_markings_mark2 
Marking Refactor, Adds tail markings + Alt heads + Secondary (F)Hair themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
 2016-10-23 19:29:54 -04:00
Crazylemon64
6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
Markolie
1a307cd8c9 Identity theft objective set fix, tank examine fix, proccall null return fix 2016-10-21 17:51:38 +02:00
Aurorablade
01f4e64f12 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-10-12 20:37:09 -04:00
Markolie
c4f7730764 Additional TEG changes 2016-10-12 14:00:02 +02:00
Fox McCloud
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
TheDZD
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 McCloud
230ec7603d Merge pull request #5750 from FlattestGuitar/nukiefix 
Fixes nukie cyberimplants being free
 2016-10-09 12:31:14 -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 McCloud
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 McCloud
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
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
Fox McCloud
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
TheDZD
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 McCloud
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
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