DZD 8de0140dcc Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling ...

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/setup.dm

2015-04-21 18:56:34 -04:00

..

admin

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

2015-04-21 18:56:34 -04:00

assembly

Add check for antags in msg_admin_attack

2015-04-12 08:41:53 -07:00

awaymissions

Removing all mutantrace crap except for slimepeople

2015-04-13 06:20:17 -04:00

client

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

2015-04-21 18:56:34 -04:00

clothing

Add flash_protect defines for 4 objects.

2015-04-13 19:20:59 -07:00

computer3

Removing all mutantrace crap except for slimepeople

2015-04-13 06:20:17 -04:00

crafting

Revert "R&D Research Levels Unification"

2015-04-07 01:16:19 -04:00

customitems

Custom Items - Theoricus

2015-04-10 03:39:18 -04:00

destilery

…

DetectiveWork

…

economy

…

events

Merge pull request #831 from Fox-McCloud/hostilemobs

2015-04-20 08:22:03 -04:00

ext_scripts

…

flufftext

…

food

DERP

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

games

…

genetics

Squish Squash

2015-04-04 14:27:53 -04:00

genetics2

…

hydroponics

derp

2015-04-18 02:37:14 -04:00

icon generation

…

jungle

[Goonchem] Reagent Decals

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

karma

…

library

…

liquid

…

media

…

mining

[Goonchem] Food Reagents

2015-04-10 04:46:50 -04:00

mob

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

2015-04-21 18:56:34 -04:00

nano

…

ninja

…

organs

Merge pull request #827 from TheDZD/minor-fixes

2015-04-20 22:16:44 -04:00

paperwork

Adds spraycans, fixes lipstick, modifies scleaner

2015-04-15 17:19:08 -07:00

power

Code rework of placing things on walls.

2015-04-19 14:29:42 -07:00

procedural mapping

Procedural Map Generator System

2015-04-11 05:28:10 -07:00

projectiles

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

2015-04-21 18:56:34 -04:00

reagents

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

2015-04-21 18:56:34 -04:00

recycling

Add check for antags in msg_admin_attack

2015-04-12 08:41:53 -07:00

research

Merge pull request #839 from tigercat2000/MassDriveVG

2015-04-21 17:31:45 -04:00

scripting

…

security levels

…

shieldgen

Revert "R&D Research Levels Unification"

2015-04-07 01:16:19 -04:00

shuttles

…

store

Byond doesn't like special characters in type paths, apparently

2015-04-08 15:09:33 -07:00

supermatter

…

surgery

Fixes surgery bugs & removes organ rejection

2015-04-14 22:12:19 -04:00

telesci

Revert "R&D Research Levels Unification"

2015-04-07 01:16:19 -04:00

vehicle

New vehicle: Four-Wheeler, (ATV)

2015-04-20 07:58:13 -07:00

virus2

Squish Squash

2015-04-04 14:27:53 -04:00