Remie Richards c1060d95b2 Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidBurns ...

Conflicts:
	code/game/atoms.dm
	code/game/objects/items.dm

2014-11-03 19:38:58 +00:00

..

admin

Merge pull request #5530 from MrStonedOne/fukkinreallyerro

2014-10-30 21:00:42 +01:00

assembly

Adding checks for stun, restrained to many object verbs.

2014-11-01 19:18:01 +01:00

awaymissions

Rewrote maploader to act faster and better handle set variables.

2014-10-26 16:26:48 +01:00

client

Merge pull request #5599 from phil235/CharScreenWindowFix

2014-11-03 10:39:32 -06:00

clothing

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

2014-11-03 19:38:58 +00: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

Fix the lag produces by oversized Pumpkings bounds interacting with space transitions.

2014-10-31 19:48:55 +01:00

flufftext

Merge pull request #5318 from phil235/MsgFix2

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

food&drinks

Merge pull request #5601 from phil235/ObjVerbCheckFix

2014-11-02 11:34:48 -06:00

holiday

Nothing to see here, continue with your planned spooking, citizens.

2014-10-31 21:52:10 +01:00

hydroponics

Tweaked

2014-10-29 20:44:58 +00:00

library

Fixes the book changing icon when carved.

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

mining

Merge remote-tracking branch 'upstream/master' into attackoftheturfs

2014-10-30 19:35:03 -03:00

mob

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

2014-11-03 19:38:58 +00:00

nano

Giacom Fixes

2014-08-06 20:22:36 +02:00

paperwork

Adding checks for stun, restrained to many object verbs.

2014-11-01 19:18:01 +01:00

power

Merge pull request #5601 from phil235/ObjVerbCheckFix

2014-11-02 11:34:48 -06:00

projectiles

Merge pull request #5601 from phil235/ObjVerbCheckFix

2014-11-02 11:34:48 -06:00

reagents

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

2014-11-03 19:38:58 +00:00

recycling

Merge pull request #5601 from phil235/ObjVerbCheckFix

2014-11-02 11:34:48 -06:00

research

Merge pull request #5530 from MrStonedOne/fukkinreallyerro

2014-10-30 21:00:42 +01: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