Markolie 3c7413dc65 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet ...

Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm

2015-09-22 00:17:30 +02:00

..

admin

Merge pull request #2084 from Markolie/looc2

2015-09-18 18:05:05 -04:00

alarm

…

assembly

Implement remove_item_from_storage properly, syndi toolbox tool color update

2015-09-16 01:54:34 +02:00

atmos_automation

Pipenet overhaul

2015-09-21 02:11:54 +02:00

awaymissions

…

client

Merge pull request #2057 from Markolie/notes

2015-09-16 20:46:09 -04:00

clothing

Merge remote-tracking branch 'origin/master' into bay_examine

2015-09-15 14:08:36 -07:00

computer3

…

crafting

…

customitems

…

destilery

…

DetectiveWork

…

economy

…

events

Pipenet overhaul

2015-09-21 02:11:54 +02:00

examine

Bayxamine: WEAPONS\!

2015-09-15 09:10:17 -07:00

ext_scripts

…

fish

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

flufftext

Pass III

2015-09-18 21:15:08 -04:00

food

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

games

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

garbage collection

gcDestroyed fixes

2015-09-21 02:33:53 +02:00

genetics2

…

holiday

…

hydroponics

Pipenet overhaul

2015-09-21 02:11:54 +02:00

icon generation

…

jungle

…

karma

…

library

…

lighting

…

liquid

…

media

…

mining

Merge pull request #2091 from Fox-McCloud/destroy-them-all

2015-09-18 22:30:49 -04:00

mob

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet

2015-09-22 00:17:30 +02:00

nano

Merge pull request #2049 from Markolie/display

2015-09-15 16:02:43 -04:00

ninja

Saber SMG update, add armour piercing variable

2015-09-21 22:50:07 +02:00

organs

Tweaks Brain Damage Messages

2015-09-19 19:50:48 -04:00

paperwork

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet

2015-09-22 00:17:30 +02:00

pooling

…

power

qdel() dem powernets

2015-09-21 01:17:12 -04:00

procedural mapping

…

projectiles

Saber SMG update, add armour piercing variable

2015-09-21 22:50:07 +02:00

reagents

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet

2015-09-22 00:17:30 +02:00

recycling

…

research

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet

2015-09-22 00:17:30 +02:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

store

…

surgery

…

telesci

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

tram

…

vehicle

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

virus2

Tweaks Brain Damage Messages

2015-09-19 19:50:48 -04:00