Zuhayr 64aa4104fc Fixed an oversight with RAD_ABSORB and collapsing. ...

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

2014-06-26 22:00:52 -04:00

..

admin

Replacing civilian with support department. Still need to make changes on MySQL schema.

2014-06-26 19:42:14 -04:00

assembly

HurrDurr

2014-05-30 22:29:11 -04:00

awaymissions

Replacing civilian with support department. Still need to make changes on MySQL schema.

2014-06-26 19:42:14 -04:00

client

Replacing civilian with support department. Still need to make changes on MySQL schema.

2014-06-26 19:42:14 -04:00

clothing

Replacing civilian with support department. Still need to make changes on MySQL schema.

2014-06-26 19:42:14 -04:00

customitems

Removed a lot of the useless testing and error logging from the runtime log.

2014-06-16 23:01:41 -04:00

destilery

…

detectivework

…

DetectiveWork

…

economy

Replacing civilian with support department. Still need to make changes on MySQL schema.

2014-06-26 19:42:14 -04:00

events

As far as I can tell, viral infections were happening irrespec

2014-06-26 21:58:46 -04:00

ext_scripts

We use this

2014-05-30 11:22:36 -04:00

flufftext

…

food

Final Nations patch before live testing. This is going to be painful.

2014-05-27 20:09:10 -04:00

genetics

…

genetics2

…

hydroponics

…

icon generation

…

library

…

liquid

…

maps

…

media

Moar trying to get the lobby jukebox working.

2014-06-25 07:04:58 -04:00

mining

Update distribution.dm

2014-06-25 06:16:02 -04:00

mob

Fixed an oversight with RAD_ABSORB and collapsing.

2014-06-26 22:00:52 -04:00

nano

…

organs

Moved same code into single organ helper to handle embedding.

2014-06-24 11:46:56 -04:00

paperwork

Removes Impedrezene from the Paralysis Pen

2014-06-08 18:30:56 -04:00

power

Fix lamps/greenlamps. I should have done this ages ago.

2014-06-25 08:05:20 -04:00

projectiles

Merge pull request #252 from Regen1/Combat-borgs

2014-06-18 06:01:46 -04:00

reagents

Made monkey cube subtypes define what type of monkey they spawn instead of weird switch in Expand().

2014-06-24 12:02:29 -04:00

recycling

Adds supply shuttle docking controllers

2014-06-19 10:13:48 -04:00

research

Adds suit cooling device

2014-06-21 17:23:30 -04:00

scripting

…

security levels

…

shuttles

Improves the fix for shuttles being stuck if...

2014-06-26 21:19:13 -04:00

store

Can't forget Ian

2014-05-26 05:52:08 -04:00

supermatter

Goddamn phoron in my plasma

2014-06-21 07:31:05 +02:00

surgery

Permanent brain exposure fix

2014-06-26 12:13:01 +02:00

vehicles

New ambulance sprite

2014-06-25 17:54:34 -04:00

virus2

Comment out Spider virus effect

2014-06-26 21:22:01 +02:00