 Tigercat2000
|
5262b56abd
|
Hot mode now spawns mist on the pool as a warning
|
2015-03-06 18:32:36 +01:00 |
|
|
Tigercat2000
|
8b66dfc063
|
Final pool controller commit, Warm and Cool modes added, Hot and Cold
moved to emag-only.
|
2015-03-06 17:19:51 +01:00 |
|
|
Fox-McCloud
|
438efadc7e
|
Cryo Fixes
|
2015-03-06 02:35:36 -05:00 |
|
|
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 |
|
|
Markolie
|
e30d4cc35d
|
Merge branch 'master' of https://github.com/Markolie/Paradise
Conflicts:
maps/cyberiad.dmm
|
2015-03-04 19:34:21 +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
|
3a196c1812
|
Re-add door forcing sound
|
2015-03-04 14:30:33 +01: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
|
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 |
|
|
Markolie
|
0000d28dfd
|
Door speedup
|
2015-03-03 20:04:04 +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
|
1db034a8f8
|
NanoUI synth airlock update
|
2015-03-03 18:45:22 +01:00 |
|
|
Tigercat2000
|
4ee50db53e
|
Adds an 'animation' for feeding people into the gibber.
|
2015-03-03 15:28:13 +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 |
|
|
SamCroswell
|
b8a9c902a1
|
Removes Space Ninjas
|
2015-03-02 19:05:44 -05:00 |
|
|
Markolie
|
82b96d305f
|
Bug fixes, update quick create object
|
2015-03-02 21:20:12 +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
|
2a0e9af539
|
Minor fixes
|
2015-03-02 02:07:53 +01:00 |
|
|
ZomgPonies
|
2b917b17cd
|
Merge pull request #475 from Markolie/master
Bug fixes galore
|
2015-03-01 14:41:42 -05:00 |
|
|
Markolie
|
d7a2559065
|
Bug fixes galore
|
2015-03-01 20:35:07 +01:00 |
|
|
ZomgPonies
|
7799470ca5
|
Merge pull request #460 from Markolie/master
Add bandanas, mask toggling, camo armor jacket, minimum drone/ERT age, turret update, NanoUI update and bugfixes
|
2015-03-01 12:30:15 -05:00 |
|
|
ZomgPonies
|
5a94b87331
|
Merge pull request #457 from Fox-McCloud/Cameras
Camera Update+Camera Bugs
|
2015-03-01 12:28:58 -05:00 |
|
|
Markolie
|
6b70bfec74
|
NanoUI update
|
2015-03-01 04:22:12 +01:00 |
|
|
ZomgPonies
|
43783ca583
|
Merge pull request #452 from Fox-McCloud/RND-Fixes-Balance
RnD Fixes and Tweaks
|
2015-02-28 22:16:37 -05:00 |
|
|
Markolie
|
607ebed0f0
|
Further turret fixes
|
2015-03-01 02:53:01 +01:00 |
|
|
Markolie
|
b28f791f8f
|
(Porta) turret update, map area update
|
2015-03-01 02:10:32 +01:00 |
|
|
Markolie
|
6ecfb9adf2
|
Turret exploit fix
|
2015-02-28 23:55:28 +01:00 |
|
|
Fox-McCloud
|
a9285627ac
|
Merge remote-tracking branch 'upstream/master' into Cameras
|
2015-02-28 16:24:03 -05:00 |
|
|
Markolie
|
7531d25ab6
|
Item path fix
|
2015-02-28 17:18:13 +01:00 |
|
|
Markolie
|
e4328a7f5e
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/suits.dmi
|
2015-02-28 17:13:53 +01:00 |
|
|
Markolie
|
f7426c8d72
|
Add bandanas, mask toggling, camo armor jacket and bugfixes
|
2015-02-28 17:09:45 +01:00 |
|
|
Fox-McCloud
|
1dba775cd8
|
Consistency
|
2015-02-28 04:19:38 -05:00 |
|
|
Fox-McCloud
|
62462c876f
|
Camera Update+Camera Bugs
|
2015-02-28 04:01:14 -05:00 |
|
|
Fox-McCloud
|
923ba5932f
|
RnD Fixes and Tweaks
|
2015-02-27 17:36:20 -05:00 |
|
|
ZomgPonies
|
f27ccb6f4d
|
Owlman/Griffin toys/posters/barsign
|
2015-02-27 13:24:45 -05:00 |
|
|
Mark van Alphen
|
d89c885a14
|
Merge pull request #435 from ZomgPonies/fixuns
Various fixings and additions
|
2015-02-27 18:22:35 +01:00 |
|
|
ZomgPonies
|
2f9b435a0f
|
Merge pull request #426 from Markolie/master
Bug fixes, add atmos watertank
|
2015-02-26 13:50:37 -05:00 |
|
|
Mark van Alphen
|
32919be0a7
|
Merge pull request #428 from Artorp/AutolatheQueue
Autolathe queue shows items being processed
|
2015-02-26 19:20:29 +01:00 |
|
|
ZomgPonies
|
9dc5f6750c
|
Firedoors no longer block zones
|
2015-02-26 12:43:39 -05:00 |
|