 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 |
|
|
Mark van Alphen
|
3e08cb97d8
|
Merge pull request #513 from ZomgPonies/master
Emergency player panel fix
|
2015-03-04 17:52:53 +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 |
|
|
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
|
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 |
|
|
Fox-McCloud
|
3ccb91ea1e
|
Merge pull request #507 from ZomgPonies/master
Player panel runtime fix
|
2015-03-04 00:06:49 -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
|
2774482615
|
Mapmerge
|
2015-03-03 22:55:07 +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 |
|
|
ZomgPonies
|
ceb00c4794
|
Merge pull request #497 from fj45/master
Minor changes to atmos.
|
2015-03-03 11:48:40 -05:00 |
|
|
Tigercat2000
|
4ee50db53e
|
Adds an 'animation' for feeding people into the gibber.
|
2015-03-03 15:28:13 +01:00 |
|
|
fj45
|
14763c8d12
|
Minor changes to Atmos.
Just moved a few bits around, added some extra fire extinguishers and
made it all a bit neater. Smal change.
|
2015-03-03 20:15:33 +08:00 |
|
|
fj45
|
c82f4bad6c
|
Merge remote-tracking branch 'upstream/master'
|
2015-03-03 19:55:07 +08:00 |
|
|
fj45
|
5e25e91ad6
|
Revert "Improved Brig Medic Vest from Aurora"
This reverts commit a53553126d.
|
2015-03-03 19:51:24 +08: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
|
62b3912e41
|
Fix DME
|
2015-03-02 21:38:52 +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 |
|