Mark van Alphen 8f19323fdd Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms ...

Conflicts:
	code/__HELPERS/lists.dm

2015-08-03 23:59:45 +02:00

..

admin

Merge pull request #1604 from TheDZD/helper

2015-08-03 17:44:01 -04:00

alarm

Alarm system overhaul

2015-08-02 07:13:03 +02:00

assembly

Powernet rework

2015-07-31 23:59:41 +02:00

atmos_automation

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

awaymissions

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

client

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

clothing

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

computer3

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

crafting

Kitchen Overhaul 2: Table Edition

2015-07-25 06:38:09 -04:00

customitems

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

destilery

…

DetectiveWork

…

economy

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

events

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

2015-08-03 23:59:45 +02:00

ext_scripts

…

fish

…

flufftext

Changes a few del to del()

2015-07-10 23:28:08 -04:00

food

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

games

…

garbage collection

…

genetics

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

genetics2

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

holiday

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

hydroponics

Merge pull request #1604 from TheDZD/helper

2015-08-03 17:44:01 -04:00

icon generation

…

jungle

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

karma

…

library

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

lighting

Lighting Runtime Fix

2015-08-02 16:57:14 -04:00

liquid

…

media

ensure the current song ends when streaming is disabled

2015-07-26 06:23:30 +02:00

mining

Merge pull request #1604 from TheDZD/helper

2015-08-03 17:44:01 -04:00

mob

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

2015-08-03 23:59:45 +02:00

nano

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

2015-08-03 23:59:45 +02:00

ninja

Replaces Reamining Del()'s

2015-07-07 00:35:19 -04:00

organs

Organ icon runtime fix

2015-07-30 20:12:16 +02:00

paperwork

LINDA Pressure Changes

2015-07-11 06:28:03 -04:00

pooling

…

power

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

2015-08-03 23:59:45 +02:00

procedural mapping

…

projectiles

Mecha turret fix

2015-08-03 22:21:19 +02:00

reagents

Merge pull request #1604 from TheDZD/helper

2015-08-03 17:44:01 -04:00

recycling

NanoUI portable scrubber/pump

2015-07-28 22:22:26 +02:00

research

Merge pull request #1604 from TheDZD/helper

2015-08-03 17:44:01 -04:00

scripting

…

security levels

ERT Rework - Code Changes

2015-07-20 19:37:56 -04:00

shieldgen

Pass II

2015-07-09 19:51:40 -04:00

shuttles

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

2015-07-30 03:08:33 +02:00

store

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

surgery

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

telesci

Update upgradable machinery New code

2015-07-30 22:19:32 +02:00

tram

…

vehicle

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

virus2

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00