Commit Graph

15347 Commits

Author SHA1 Message Date
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
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
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
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
Artorp
653bb883ff Gives cargo computers a contents link
Allows people to preview what they are requesting via the Supply Shuttle
Console and the Supply Ordering Console
2015-03-02 22:37:12 +01:00
Markolie
aba5593393 Runtime fixes 2015-03-02 21:34:25 +01:00
Markolie
82b96d305f Bug fixes, update quick create object 2015-03-02 21:20:12 +01: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
Markolie
2d152cb82d Debug 2015-03-02 18:49:12 +01:00
Markolie
3d9807f78c Floor bot improvements 2015-03-02 18:46:50 +01:00
Markolie
cf0220312b Bug fixes 2015-03-02 18:30:40 +01:00
Mark van Alphen
3e5bc9e230 Merge pull request #487 from Artorp/FewFixes
Few bugfixes
2015-03-02 18:21:15 +01:00
Artorp
7843fed4ce Updates paperwork: Armory list 2015-03-02 17:59:22 +01:00
Artorp
838b3960cc Fixes taperecorder emag_act() 2015-03-02 17:58:28 +01:00
Markolie
013a600228 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-03-02 17:53:42 +01:00
Markolie
0fe7d84551 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-03-02 17:33:00 +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
Markolie
2a0e9af539 Minor fixes 2015-03-02 02:07:53 +01: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