cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 18:11:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,217 Commits 26 Branches 2 Tags
addfbe449e5fde4a09bcedebc4ed569a888e6f96
Commit Graph

8939 Commits

Author SHA1 Message Date
SamCroswell
addfbe449e Adds Shuriken 2015-03-09 21:28:28 -04:00
SamCroswell
5bb63a7f63 Merge Conflict Resolution 
Conflicts:
	icons/obj/clothing/gloves.dmi
 2015-03-08 15:59:20 -04:00
Markolie
c09c27958a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	maps/cyberiad.dmm
 2015-03-08 20:10:49 +01: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
Markolie
80a560d291 Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4 2015-03-08 19:05:36 +01:00
Markolie
b8b0fd13b8 Artvend, merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/response_team.dm
	maps/cyberiad.dmm
 2015-03-08 18:54:13 +01:00
ZomgPonies
9a21ce5fef Merge pull request #529 from Fox-McCloud/Crayons 
Crayons and Gloves
 2015-03-08 13:24:05 -04:00
ZomgPonies
10eabef051 Merge pull request #531 from Fox-McCloud/ArtVend 
Art vend
 2015-03-08 13:23:43 -04:00
ZomgPonies
9e57d2424f Merge pull request #528 from TheDZD/nano_pai 
NanoUI pAIs
 2015-03-08 13:23:05 -04:00
SamCroswell
9b87487783 Minor Fixes 2015-03-07 23:13:00 -05:00
SamCroswell
efd546d1e4 Ninja glove icon update, ninja suit toggle function 2015-03-07 19:54:00 -05:00
SamCroswell
723044ebc6 Ninja icons addition, glasses code tweak 2015-03-07 10:31:56 -05:00
Fox-McCloud
a3bfa5300b ArtVend 2015-03-07 03:26:45 -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
Fox-McCloud
6eac47a00a Merge pull request #519 from ZomgPonies/superhero 
Superhero update
 2015-03-06 15:28:17 -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
7e542873fe Fixes 2015-03-06 01:13:03 -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
SamCroswell
ede55cc8f5 Re-Adds Ninja Gear 2015-03-05 17:17:52 -05:00
ZomgPonies
06ee04e839 Superhero update 2015-03-05 15:53:15 -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
Fox-McCloud
91fd4d9683 Frost Oil Fix 2015-03-04 20:56:14 -05:00
Fox-McCloud
60d4038ed5 Comfy Mining Turfs? NO! 2015-03-04 17:56:30 -05:00
Markolie
3fcfcbc7bb Select equipment ERT jumpsuit 2015-03-04 19:48:30 +01:00
Markolie
e30d4cc35d Merge branch 'master' of https://github.com/Markolie/Paradise 
Conflicts:
	maps/cyberiad.dmm
 2015-03-04 19:34:21 +01: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
a44e80a415 Fix blood drip colors 2015-03-04 11:40:26 -05:00
Markolie
4fb7a95cff ERT equipment update 2015-03-04 17:16:19 +01:00
Markolie
9c54d2feaa Central Command access rework 2015-03-04 16:36:17 +01: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
Markolie
4ac1007d82 ERT equipment rework 2015-03-03 22:51:54 +01:00