cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-21 12:01:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 10 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

17074 Commits

Author SHA1 Message Date
Tigercat2000
f58d3a9b75 Poolcontroller update-fix 2015-03-05 22:46:36 +01:00
Tigercat2000
abd25690e1 Adds pool controller 2015-03-05 22:24:36 +01: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
eaf6e71988 Fix Spacepod infinite explosion bug 2015-03-05 13:40:27 -05:00
ZomgPonies
0fd3cdfb33 Fixing the SSD infinite sleep bug 2015-03-05 13:34:01 -05:00
Markolie
6ca0f0fcc6 Allow ERT gender selection, ERT jumpsuit revert 2015-03-05 18:48:24 +01: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
495b02864a Actually equip the ERT jumpsuits 2015-03-04 19:47:20 +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
Markolie
9cbb93777e ERT armory rework 2015-03-04 19:06:22 +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
Tigercat2000
d0b40ee5a9 Merge branch 'master' of github.com:ParadiseSS13/Paradise into SlimeColorChanger 2015-03-04 18:11:36 +01:00
Tigercat2000
ba6ec715c7 MySQL handling for slime color choice 2015-03-04 18:10:37 +01:00
ZomgPonies
a44e80a415 Fix blood drip colors 2015-03-04 11:40:26 -05:00
ZomgPonies
ee510e7b12 Emergency player panel fix 2015-03-04 11:29:25 -05:00
Tigercat2000
64c0db3a80 Merge branch 'master' of github.com:ParadiseSS13/Paradise into SlimeColorChanger 2015-03-04 17:20:26 +01: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
0e4c12b3cc Merge pull request #498 from tigercat2000/Gibberanim 
Adds an 'animation' for feeding people into the gibber.
 2015-03-04 10:25:55 -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
Markolie
3a196c1812 Re-add door forcing sound 2015-03-04 14:30:33 +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
f6add1e12c Player panel runtime fix 2015-03-04 00:01:20 -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
e23c10f0e4 Attempted player panel fix 2015-03-03 23:56:23 +01: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
Fox-McCloud
54385f0197 Merge pull request #491 from Artorp/CargoContents 
Gives cargo computers a contents link
 2015-03-03 16:38:18 -05:00
Fox-McCloud
253563e211 Energy Tweaks 2015-03-03 16:00:07 -05:00
Markolie
a497411d89 Fix portable turret runtime, fix AI meter examine 2015-03-03 20:19:48 +01:00
Markolie
b8786053a1 Clown/Mime door sounds 2015-03-03 20:11:24 +01:00
ZomgPonies
90f950fdf5 Merge pull request #490 from Artorp/KitchenHarvest 
Makes harvesting animals give meat equal to their meat amount
 2015-03-03 14:07:28 -05:00
Markolie
0000d28dfd Door speedup 2015-03-03 20:04:04 +01:00
Markolie
a4ab62de58 Fix debraining a severed head 2015-03-03 19:52:10 +01:00
ZomgPonies
8a575700b9 Finally got colored blood working properly 2015-03-03 13:45:46 -05:00
Markolie
d727b93cc0 Further door fixes 2015-03-03 19:26:12 +01:00
Markolie
3f7e07101f Mercenary --> Syndicate Operative 2015-03-03 18:48:58 +01:00
Markolie
1db034a8f8 NanoUI synth airlock update 2015-03-03 18:45:22 +01:00
Markolie
4dd857e022 Ion storm event update 2015-03-03 18:43:55 +01:00
Tigercat2000
4ee50db53e Adds an 'animation' for feeding people into the gibber. 2015-03-03 15:28:13 +01:00