Markolie 8bede1db99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace ...

Conflicts:
	code/modules/mob/living/simple_animal/friendly/fox.dm
	code/modules/organs/organ_alien.dm

2015-08-18 18:38:59 +02:00

..

devices

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

2015-08-18 18:38:59 +02:00

mountable_frames

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

robot

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

2015-08-18 18:38:59 +02:00

stacks

Powernet rework

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

weapons

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

2015-08-18 18:38:59 +02:00

ashtray.dm

The Great Del() Cull of 2015

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

blueprints.dm

Replace 2 A.name==Space checks with istypes

2015-05-22 11:23:20 -07:00

bodybag.dm

Further fixes to morgues and crematoriums

2015-07-14 04:08:56 -04:00

candle.dm

The Great Del() Cull of 2015

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

changestone.dm

…

contraband.dm

[Goonchem] Reagent Decals

2015-04-17 18:27:49 -04:00

crayons.dm

Removes genitalia from graffiti

2015-06-17 12:22:29 -04:00

dehy_carp.dm

Carp Plushie Syndies Buff

2015-04-24 01:40:24 -04:00

documents.dm

…

flag.dm

The Great Del() Cull of 2015

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

latexballoon.dm

Modify fire_act to temperature_expose where needed

2015-04-29 16:56:12 -07:00

misc.dm

Cleanup /defines/ folder.

2015-05-09 16:06:59 -07:00

policetape.dm

The Great Del() Cull of 2015

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

random_items.dm

Replaces typesof with subtypesof where applicable

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

shooting_range.dm

The Great Del() Cull of 2015

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

toys.dm

The Great Del() Cull of 2015

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

trash.dm

LINDA, Stage 1

2015-04-28 08:43:42 -07:00