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

Conflicts:
	code/game/jobs/job/support.dm
	code/setup.dm

2015-02-22 19:12:11 +01:00

..

admin

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

2015-02-22 19:12:11 +01:00

assembly

Standardize mutations

2015-02-22 19:04:43 +01:00

awaymissions

Standardize mutations

2015-02-22 19:04:43 +01:00

client

Standardize mutations

2015-02-22 19:04:43 +01:00

clothing

Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits

2015-02-22 08:27:38 -05:00

computer3

Switch copytext and sanitize proc

2015-02-20 22:17:13 +01:00

crafting

Table crafting refactor

2015-02-22 01:50:57 +01:00

customitems

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

destilery

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

DetectiveWork

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

economy

Announcement system overhaul, crew monitor system overhaul, add portable crew monitor

2015-02-16 19:03:29 +01:00

events

Move mass hallucination event to moderate, change weight of cargo bonus

2015-02-16 23:05:25 +01:00

ext_scripts

…

flufftext

Crossbow Rework

2015-02-03 23:35:09 -05:00

food

…

games

…

genetics

…

genetics2

…

hydroponics

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

icon generation

…

jungle

Defib update, cell path update

2015-02-09 16:12:01 +01:00

karma

Revert "Revert "Saycode/language/species port from Bay""

2015-02-20 17:46:35 +01:00

library

Switch copytext and sanitize proc

2015-02-20 22:17:13 +01:00

liquid

…

media

Remove jukebox debug

2015-01-31 15:38:16 +01:00

mining

Final crafting fixes

2015-02-22 02:24:53 +01:00

mob

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

2015-02-22 19:12:11 +01:00

nano

Standardize mutations

2015-02-22 19:04:43 +01:00

organs

Part 2 of saycode/language/species port from Bay. Also includes bugfixes.

2015-02-20 00:50:28 +01:00

paperwork

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

2015-02-22 19:12:11 +01:00

power

Standardize mutations

2015-02-22 19:04:43 +01:00

projectiles

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

2015-02-22 19:12:11 +01:00

reagents

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

2015-02-22 19:12:11 +01:00

recycling

Standardize mutations

2015-02-22 19:04:43 +01:00

research

Merge pull request #380 from Markolie/master

2015-02-22 08:30:11 -05:00

scripting

…

security levels

Z-level check refactor

2015-02-16 20:33:28 +01:00

shieldgen

Blob event fixes, toggle preferences age check, jobban check

2015-02-01 14:19:11 +01:00

shuttles

Announcement system overhaul, crew monitor system overhaul, add portable crew monitor

2015-02-16 19:03:29 +01:00

store

Z-level check refactor

2015-02-16 20:33:28 +01:00

supermatter

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

surgery

Revert "Revert "Saycode/language/species port from Bay""

2015-02-20 17:46:35 +01:00

telesci

Switch copytext and sanitize proc

2015-02-20 22:17:13 +01:00

vehicles

Merge with upstream/master

2015-02-18 13:41:32 -05:00

virus2

Standardize mutations

2015-02-22 19:04:43 +01:00