Cheridan 6731fe8b83 Merge branch 'master' of https://github.com/tgstation/-tg-station ...

Conflicts:
	code/game/objects/items/weapons/handcuffs.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2013-04-16 23:07:35 -05:00

..

admin

Merge pull request #329 from Carn/Issue304

2013-04-08 00:28:50 -07: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

Merge pull request #181 from Carn/Issue105

2013-04-02 19:05:47 -07:00

clothing

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

2013-04-16 23:07:35 -05:00

detectivework

Revert "Remove transfer_fingerprint_to in favor of add_fingerprint"

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

events

>datum/event and datum/event_control were renamed to datum/round_event and datum/round_event_control. This is because datum/event was already used by a different/more-general event queue system (used primarily on mechas)

2013-04-08 07:42:46 +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

-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 https://github.com/tgstation/-tg-station

2013-04-16 23:07:35 -05:00

paperwork

Merge pull request #329 from Carn/Issue304

2013-04-08 00:28:50 -07:00

power

Shunted AI Tracking

2013-04-05 16:16:23 -05:00

projectiles

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

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

reagents

Pepper Spray Update!!

2013-04-09 14:58:41 -05: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

Adds GetTypeInAllContents, which should be self-explanatory. Recursively checks for a typepath locating in an atom.

2013-03-28 13:00:32 +00:00