Pete Goodfellow 842d9028d3 Merge branch 'master' of github.com:tgstation/-tg-station ...

Conflicts:
	code/modules/mob/new_player/new_player.dm

2013-04-01 16:29:36 +01:00

..

admin

Merge branch 'master' of github.com:tgstation/-tg-station

2013-04-01 16:29:36 +01:00

assembly

Changes for all the different update icons procs of humans and monkeys, they now update their own sprite and hud icon (if it's a proc of a slot item) without having to call for update_icons().

2013-03-04 05:01:07 +00:00

awaymissions

Updates HUD stuff!

2013-03-08 21:32:00 +00:00

client

Typofix

2013-04-01 02:56:33 +01:00

clothing

Fixes capitalisation of all suit names.

2013-03-29 18:52:35 +00:00

detectivework

Revert "Remove transfer_fingerprint_to in favor of add_fingerprint"

2013-03-12 08:22:17 -07:00

events

Accidentally remove a dna initialize call.

2013-03-28 11:21:14 +00:00

flufftext

Standardized some variable defines in hallucionation.dm

2013-02-06 22:32:27 +00:00

food

Committing datum based surgery proper. There's a brief explanation in surgery.dm, if you want to know how it works.

2013-02-14 01:20:58 +00:00

hydroponics

-Recodes glowshrooms.

2013-03-17 19:24:51 -05:00

library

Merge pull request #92 from Petethegoat/DB_cleanup

2013-03-28 10:13:06 -07:00

mining

Updates HUD stuff!

2013-03-08 21:32:00 +00:00

mob

Merge branch 'master' of github.com:tgstation/-tg-station

2013-04-01 16:29:36 +01:00

paperwork

Airlock painters! Commit for Ricotez

2013-03-12 19:36:15 -04:00

power

Fixes cable.dm. Cheri!!

2013-03-30 17:51:27 +00:00

projectiles

Merge branch 'master' of github.com:tgstation/-tg-station into pr/151

2013-03-28 18:35:37 +00:00

reagents

Merge pull request #158 from Cheridan/master

2013-03-29 01:52:34 -07:00

recycling

Revert "Remove transfer_fingerprint_to in favor of add_fingerprint"

2013-03-12 08:22:17 -07:00

research

Final Version of DesignHasReqs

2013-03-26 13:20:33 -05:00

scripting

* Committing in NTSL now takes time. It can take up to a maximum of 2.5 minutes and a minimum of 10 seconds.

2013-03-13 00:12:40 +00:00

security levels

Updated the map with fixed incinerator doors that use the new heat_proof var.

2012-12-16 20:52:29 +00:00

surgery

Added exceptions to the cavity implant for the nuke disk and organs (because it would interfere with the getbrain/getappendix procs).

2013-02-25 23:56:31 +00:00