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
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
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
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
Fox-McCloud
253563e211
Energy Tweaks
2015-03-03 16:00:07 -05: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
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
3f7e07101f
Mercenary --> Syndicate Operative
2015-03-03 18:48:58 +01:00
Markolie
4dd857e022
Ion storm event update
2015-03-03 18:43:55 +01: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
ZomgPonies
0334dd0757
Merge pull request #489 from Markolie/master
...
Bug fixes
2015-03-02 21:19:01 -05:00
SamCroswell
b8a9c902a1
Removes Space Ninjas
2015-03-02 19:05:44 -05:00
SamCroswell