cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 07:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,259 Commits 26 Branches 2 Tags
bee7dc659b344bd202d8db8e5d664d013cdcfc87
Commit Graph

4573 Commits

Author SHA1 Message Date
ZomgPonies
d1587addaf No more crazy random colors 2015-03-09 22:32:14 -04:00
Fox-McCloud
7fda1b1fd5 Merge pull request #539 from ZomgPonies/plasma 
Plasmamen Softsuit Fixes
 2015-03-08 20:31:44 -04:00
ZomgPonies
00902cf5a7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into plasma 
Conflicts:
	icons/mob/suit.dmi
 2015-03-08 17:47:32 -04:00
ZomgPonies
479fb500ba Some more plasmamen eva suit bugs 2015-03-08 17:34:32 -04:00
ZomgPonies
e45aea4d2f Added karma jobs to custom softsuits 2015-03-08 16:08:36 -04:00
SamCroswell
5bb63a7f63 Merge Conflict Resolution 
Conflicts:
	icons/obj/clothing/gloves.dmi
 2015-03-08 15:59:20 -04:00
ZomgPonies
1848926a32 Oops hurr durr 2015-03-08 15:55:01 -04:00
Mark van Alphen
71c344013e Merge pull request #518 from ZomgPonies/plasma 
Adds Plasmaman to Karma Shop
 2015-03-08 20:02:16 +01:00
ZomgPonies
e82442b831 No special language for now. 2015-03-08 14:37:47 -04:00
ZomgPonies
b573472e55 Adds missing spacesuits to plasmamen 2015-03-08 14:34:39 -04:00
ZomgPonies
9a21ce5fef Merge pull request #529 from Fox-McCloud/Crayons 
Crayons and Gloves
 2015-03-08 13:24:05 -04:00
ZomgPonies
9e57d2424f Merge pull request #528 from TheDZD/nano_pai 
NanoUI pAIs
 2015-03-08 13:23:05 -04:00
SamCroswell
723044ebc6 Ninja icons addition, glasses code tweak 2015-03-07 10:31:56 -05:00
Fox-McCloud
4e4e7ae77f Crayons and Gloves 2015-03-06 21:40:57 -05:00
DZD
922cd08fd5 Removes 2 lines that do nothing. 2015-03-06 19:56:40 -05:00
DZD
d2d0627d43 NanoUI pAIs 2015-03-06 18:34:45 -05:00
ZomgPonies
8c34221110 Merge pull request #523 from Fox-McCloud/Syndi-Channel-Fix 
Fixes
 2015-03-06 12:55:24 -05:00
ZomgPonies
17a9e38439 Merge pull request #511 from Fox-McCloud/Life-Proc-Work 
Life Proc Changes--Cold Space and and Temp Handling
 2015-03-06 12:54:42 -05:00
Fox-McCloud
0c751dc7f6 Xeno attack borg fix 2015-03-06 07:20:57 -05:00
Fox-McCloud
a74bb8a710 Fire Fixes 2015-03-05 20:30:18 -05:00
Fox-McCloud
0ffe412121 Pressure protection 2015-03-05 18:33:18 -05:00
SamCroswell
5fac18862e Fixes Nightvision Glasses 
Nightvision glasses no longer have a snowflake check, instead all
glasses have a see_darkness variable that determines if they see the
darkness overlay.
 2015-03-05 18:25:20 -05:00
ZomgPonies
c942b5e60c Adds Plasmaman to Karma Shop 2015-03-05 14:35:17 -05:00
ZomgPonies
0fd3cdfb33 Fixing the SSD infinite sleep bug 2015-03-05 13:34:01 -05:00
ZomgPonies
646ef4563e Removed old snowflake bloodcode references 2015-03-04 12:24:47 -05:00
ZomgPonies
13aeecf33c Removed some blood flags, added blood color to greys and kidan 2015-03-04 12:17:14 -05:00
ZomgPonies
bc900d678a Merge pull request #512 from Markolie/master 
Fix player panel, other fixes
 2015-03-04 10:23:36 -05:00
Markolie
6352d2abd9 Remove qdel from ghost images, clarify qdel debug, nanoUI runtime fix 2015-03-04 15:09:12 +01:00
Markolie
691fef1ff0 Fix player panel 2015-03-04 14:47:45 +01:00
Fox-McCloud
2548b838cf fix 2015-03-04 06:22:18 -05:00
Fox-McCloud
a911b53e8b Life Proc Changes--Cold Space and and Temp Handling 2015-03-04 05:42:12 -05:00
Fox-McCloud
5cad8fe41e Merge pull request #500 from ZomgPonies/blood 
Proper colored blood
 2015-03-04 00:24:53 -05:00
ZomgPonies
3fec57ed8f Merge pull request #494 from Fox-McCloud/Cyborg-Balance 
Cyborg Rebalance
 2015-03-04 00:15:15 -05:00
ZomgPonies
463204c913 Merge pull request #493 from Markolie/master 
NanoUI synth airlock control, ERT equipment rework, fixes
 2015-03-03 21:28:22 -05:00
ZomgPonies
10ee512d22 Merge pull request #492 from SamCroswell/dave-NinjaDev 
Removes Space Ninjas
 2015-03-03 21:26:16 -05:00
Markolie
3497d4ba9e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	maps/cyberiad.dmm
 2015-03-03 22:58:41 +01:00
Fox-McCloud
253563e211 Energy Tweaks 2015-03-03 16:00:07 -05:00
ZomgPonies
8a575700b9 Finally got colored blood working properly 2015-03-03 13:45:46 -05:00
Fox-McCloud
c1a1f851cf Cyborg Rebalance 2015-03-02 22:54:09 -05:00
Markolie
1deef3104e NanoUI synth airlock controller 2015-03-03 04:51:32 +01:00
SamCroswell
b8a9c902a1 Removes Space Ninjas 2015-03-02 19:05:44 -05:00
Artorp
95538029a1 Harvesting animals will always gib 2015-03-02 20:14:02 +01:00
Artorp
c35711c394 Makes harvest() give meat equal to meat_amount 2015-03-02 19:50:50 +01:00
ZomgPonies
efcbfebf99 Emergency corgi runtime Fix 2015-03-02 11:22:21 -05:00
Fox-McCloud
63352fcfc2 Merge pull request #479 from ZomgPonies/darkness 
The Ghostsight the server deserves
 2015-03-02 00:57:12 -05:00
ZomgPonies
6979cf6089 Merge pull request #477 from Fox-McCloud/Chemistry-Cleanup 
Chemistry Cleanup and Fixes
 2015-03-01 23:08:16 -05:00
DZD
69eb5509ec Fixes exchange document objective 2015-03-01 20:35:09 -05:00
ZomgPonies
bc7088a6d7 Added AIeye to new system 2015-03-01 19:40:02 -05:00
ZomgPonies
86e300bc67 Fixes Ghostsight for realsies 2015-03-01 19:10:25 -05:00
Fox-McCloud
3bed31e08c Chemistry Cleanup and Fixes 2015-03-01 16:34:23 -05:00