cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 11:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,603 Commits 26 Branches 2 Tags
a653dfd69dfd59b5826a575c334e24423e30bd3f
Commit Graph

1405 Commits

Author SHA1 Message Date
Fox McCloud
953c4ba1b2 Merge pull request #3786 from TheDZD/WEEEEEOOOOOWEEEEEOOOOOWEEEEEOOOOO 
Brings Justice to the Station
 2016-03-08 20:14:43 -05:00
TheDZD
4e47626af7 Merge pull request #3767 from Tastyfish/silence 
Tranquillité, Prospérité & Mimeré
 2016-03-08 19:32:29 -05:00
TheDZD
daf0c6bc31 Brings justice to the station 2016-03-07 17:50:41 -05:00
Fox McCloud
c3285d20ef Merge pull request #3777 from Tastyfish/wiznerd 
Fixes lich spell preventing round end when viewed in the spellbook
 2016-03-06 22:13:26 -05:00
Tastyfish
422a2e6ed4 Fixes lich spell preventing round end when viewed in the spellbook 2016-03-06 21:59:48 -05:00
Tastyfish
a4e3fc7905 Fixes /datum/events, and by proxy the cable layer 2016-03-06 20:08:37 -05:00
Tastyfish
d189d70f4a Adds tranquillite 
Changes Recitence to be approx on par with Honker
Adds invisible wall barrier
 2016-03-06 01:49:30 -05:00
TheDZD
4b610d8dda Merge pull request #3758 from Fox-McCloud/remove-halloss 
Removes Halloss
 2016-03-05 22:39:19 -05:00
Fox McCloud
ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor 
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
 2016-03-04 19:51:50 -05:00
Fox-McCloud
4d9627e986 Removes Halloss 2016-03-03 23:26:41 -05:00
Fox McCloud
60b0d6f2fe Merge pull request #3639 from Crazylemon64/matrix_and_path_editing 
Adds matrix and path editing to the variable viewer
 2016-03-03 20:31:25 -05:00
TheDZD
c3d679eb47 Merge pull request #3736 from Fox-McCloud/miming-refactor 
Miming Refactor
 2016-02-29 22:42:26 -05:00
Fox-McCloud
e2bb00a5b1 Miming Refactor 2016-02-28 22:40:00 -05:00
Fox-McCloud
84def6e144 Adds Sleeping Carp Scroll to Uplink 2016-02-28 02:08:32 -05:00
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Fox-McCloud
cbdc93ea6a Tweaks Pickpocket Gloves 2016-02-23 22:56:21 -05:00
Tastyfish
85cfccf2d9 Refactors renaming so it works consistently 2016-02-19 21:03:33 -05:00
Crazylemon64
8a7a17b8e6 Adds matrix and path editing to the variable viewer 2016-02-19 01:20:01 -08:00
Aurorablade
570dd619b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-18 19:01:41 -05:00
Fox-McCloud
9d7904e29f EMP Kit Tweak 2016-02-15 01:57:16 -05:00
Aurorablade
400ed30455 issue with identity transfer 2016-02-13 15:20:21 -05:00
Aurorablade
9a55bb11b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-13 06:37:49 -05:00
TheDZD
65a788d51f Merge pull request #3569 from Fox-McCloud/unarmed-golems-martial 
Unarmed Attack+Martial Arts Update+Golem Refactor
 2016-02-12 18:17:32 -05:00
Fox-McCloud
f37a21a91a carp grab fix 2016-02-11 21:45:30 -05:00
Aurorablade
545d3abf19 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-11 18:03:09 -05:00
Fox-McCloud
34e45a656e Unarmed Attack+Martial Arts Update+Golem Refactor 2016-02-11 00:11:20 -05:00
Fox-McCloud
5f2b5f1fde Updates Fake Disintegrate and Spell Icons 2016-02-10 00:01:37 -05:00
Fox McCloud
05ba314d1b Merge pull request #3530 from Robertha89/patch-6 
add tesla to supplypacks
 2016-02-08 18:26:27 -05:00
Robertha89
15e37b498c Removes a grounding rod 2016-02-07 23:07:59 +01:00
Robertha89
a743335161 add grounding, and coil, minor fixes. 2016-02-07 23:06:49 +01:00
Robertha89
dba3a8d937 Fixes issue 2016-02-07 19:40:19 +01:00
Robertha89
8accdb52db add tesla to supplypacks 2016-02-07 19:27:22 +01:00
Fox-McCloud
a64e95104e Removes Mindswap Suiciding 2016-02-05 22:30:43 -05:00
Fox McCloud
b30a0dfacb Merge pull request #3441 from Crazylemon64/squishy_hair 
Squishy Slime Hair Woooooo
 2016-02-02 21:14:54 -05:00
Aurorablade
25876fd036 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-02 15:35:54 -05:00
Crazylemon64
945dbe0f0e Woo everything's done 2016-02-01 09:19:05 -08:00
TheDZD
f12e56cd69 Merge pull request #3445 from Fox-McCloud/summon-guns 
Updates Summon Guns
 2016-01-31 18:44:12 -05:00
Tastyfish
ef79569075 Fixed continuous rounds 2016-01-30 20:33:45 -05:00
Fox-McCloud
9ff52f91a8 Updates Summon Guns 2016-01-29 22:54:07 -05:00
Fox-McCloud
887ce1f37e fixes blind spell 2016-01-29 21:31:16 -05:00
Fox-McCloud
1404d66fff tweaks 2016-01-29 19:40:46 -05:00
Fox-McCloud
1ff23cd3ca lesser summon guns, wizman update 2016-01-29 09:12:37 -05:00
Fox-McCloud
7a29f1c0da runtime fix 2016-01-28 20:27:05 -05:00
Fox-McCloud
cfa857cd35 Adds in Lichdom Spell 2016-01-28 18:57:00 -05:00
Aurorablade
b2881bdc94 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-26 21:17:25 -05:00
Aurorablade
53f410272a home streach. 2016-01-26 20:53:13 -05:00
Crazylemon
07a62934e4 Brainmobs can no longer ethereal jaunt 2016-01-25 19:21:40 -08:00
Fox-McCloud
f5220f7ce3 Assault Surplus Create and Knife Refactor 2016-01-22 10:04:24 -05:00
Aurorablade
95dca71432 Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-21 21:11:26 -05:00
TheDZD
c7b9c3dc6e Merge pull request #3273 from Fox-McCloud/implant-refactor-II 
Implant Refactor Part II
 2016-01-19 19:11:10 -05:00