Markolie 3b1dc8e487 Merge branch 'master' of https://github.com/ZomgPonies/Paradise ...

Conflicts:
	icons/obj/weapons.dmi
	maps/cyberiad.dmm

2014-11-27 21:39:01 +01:00

..

admin

Merge branch 'master' of https://github.com/ZomgPonies/Paradise

2014-11-27 21:39:01 +01:00

assembly

…

awaymissions

…

client

MySQL fixes

2014-08-16 18:12:44 -04:00

clothing

Merge pull request #530 from Markolie/master

2014-11-26 20:58:35 -05:00

customitems

Sparkyninja's beret

2014-11-24 03:30:03 +01:00

destilery

…

detectivework

…

DetectiveWork

Wet rag no longer makes noise or hits when wiping down windows (nor does anything with the NOBLUDGEON flag)

2014-08-03 15:28:36 -04:00

economy

…

events

AI, PDA, and Other changes

2014-11-26 01:18:49 -05:00

ext_scripts

…

flufftext

…

food

Changed ..()

2014-08-23 16:55:30 -04:00

games

…

genetics

…

genetics2

…

hydroponics

Botany Mutation Rework

2014-11-23 03:14:21 -05:00

icon generation

…

library

…

liquid

…

maps

…

media

Jukebox radio fixes

2014-07-27 13:49:50 -04:00

mining

Merge pull request #119 from ZomgPonies/master

2014-11-24 02:45:57 +01:00

mob

Merge branch 'master' of https://github.com/ZomgPonies/Paradise

2014-11-27 21:39:01 +01:00

nano

…

organs

Dismemberment Update, Fire Axe Fixes, Gun Sounds

2014-11-23 00:52:32 -05:00

paperwork

Bug fixes, implements new copying/faxing system from Bay

2014-11-27 21:00:58 +01:00

power

Makes SMES'es and Vending Machines constructable and upgradeable, gives borgs recorders

2014-11-18 20:36:40 +01:00

projectiles

Projectile Laser Update

2014-11-26 19:16:21 -05:00

reagents

Projectile Laser Update

2014-11-26 19:16:21 -05:00

recycling

…

research

Projectile Laser Update

2014-11-26 19:16:21 -05:00

scripting

…

security levels

Switch Keycard Authentication Device to NanoUI

2014-11-09 01:37:51 +01:00

shuttles

Allows pod to be launched if shuttle leaves early

2014-08-01 01:00:21 -04:00

store

…

supermatter

Is a little convoluted but this removes the last X: use in supermatter.dm

2014-08-02 22:12:46 -04:00

surgery

Cleanup of internal organs

2014-08-21 10:24:13 +01:00

vehicles

Fixes runtime in train/explode()

2014-08-16 21:10:23 -04:00

virus2

Tweaks and Fixes and Major Map Changed

2014-10-13 22:00:07 -04:00