Pete Goodfellow 46b8ba8341 Merge branch 'master' of github.com:tgstation/-tg-station into chemistry ...

Conflicts:
	code/game/objects/items/weapons/tools.dm

2013-05-12 15:09:21 +01:00

..

admin

Pull Request #548 - vareditting ckey, key, icon, icon_state, overlays, underlays have permission alternatives

2013-05-12 02:42:52 +01:00

assembly

onetankbombs not passing stuff to bombassemblys

2013-04-18 21:15:56 -07:00

awaymissions

Resolves #283

2013-04-24 09:37:30 +01:00

client

Merge pull request #483 from kyrahabattoir/gui_stamps

2013-05-03 22:04:31 -07:00

clothing

-Added high-visibility orange ID card icon for prisoner IDs

2013-05-11 15:22:52 -06:00

detectivework

Resolves #283

2013-04-24 09:37:30 +01:00

events

Resolves #283

2013-04-24 09:37:30 +01: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

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

2013-05-12 15:09:21 +01:00

library

- Updates library table definition

2013-04-21 19:35:42 +02:00

mining

Cable coils now update mob inhands correctly when used up. Changed cable coil items to use the existing update_icon() proc, instead of their own updateicon().

2013-04-27 09:32:50 +10:00

mob

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

2013-05-12 15:09:21 +01:00

paperwork

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

2013-05-12 15:09:21 +01:00

power

re-arranged cable actions so src wouldn't get deleted before everything was completed

2013-05-05 05:17:31 -04:00

projectiles

Resolves #283

2013-04-24 09:37:30 +01:00

reagents

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

2013-05-12 15:09:21 +01:00

recycling

Removes /obj/item/weapon/gift from the code, as it was completely unused.

2013-03-28 13:02:46 +00:00

research

Fixes circuit printers not accepting acid. Their afterattack() was being ignored.

2013-04-01 22:32:24 -03: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

Merge pull request #392 from Ikarrus/debrain

2013-04-24 22:31:36 -07:00