MrPerson 2c8adffac3 Merge branch 'master' of https://github.com/tgstation/-tg-station into space_movement_jam ...

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

2014-10-25 23:25:27 -07:00

..

admin

Merge pull request #5454 from MrStonedOne/t-t-t-tadaydb

2014-10-25 18:41:24 -07:00

assembly

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

2014-10-22 20:54:35 +02:00

awaymissions

Makes the gateway unacidable.

2014-10-12 20:43:15 +03:00

client

Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2

2014-10-08 09:48:49 -07:00

clothing

drill sergeant hat for HoS instead of police

2014-10-25 13:51:36 -07:00

crafting

moved files and fixed tablecrafting

2014-10-17 10:30:04 -07:00

detectivework

The rest of the junk

2014-09-05 18:14:02 +04:00

events

Also fixing the end() proc for pyroplastic anomaly.

2014-10-22 21:00:38 +02:00

flufftext

Merge pull request #5318 from phil235/MsgFix2

2014-10-19 21:39:06 -05:00

food&drinks

Ian emotes while eating again. Fixed #5147

2014-10-11 14:35:35 +02:00

hydroponics

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

2014-10-20 21:38:39 -07:00

library

Fixes the book changing icon when carved.

2014-10-21 23:51:41 +02:00

mining

The supply shuttle, supply ordering, ore redemption and mining vendor consoles in cargo now use datum/browser/popups instead of user << browse so they don't look like random HTML pages.

2014-10-23 15:26:33 +03:00

mob

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

2014-10-25 23:25:27 -07:00

nano

…

paperwork

changed ishuman to tool user check

2014-10-17 13:08:13 -07:00

power

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

2014-10-25 23:25:27 -07:00

projectiles

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

2014-10-25 23:25:27 -07:00

reagents

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

2014-10-25 23:25:27 -07:00

recycling

Merge pull request #5277 from paprka/newshotguns

2014-10-21 09:51:35 -07:00

research

Merge pull request #5216 from phil235/bodybagfix1

2014-10-21 12:15:30 -05:00

scripting

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

security levels

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

2014-10-05 13:48:11 +02:00

shuttle

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

surgery

removing comment.

2014-09-21 22:26:18 +02:00

telesci

Removes telesci comp's update_icon override

2014-10-07 23:16:52 +11:00