Menshin b77e2fc46a Conflicts solving

2014-11-04 20:24:52 +01:00

..

admin

Conflicts solving

2014-11-04 20:24:52 +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 #5490 from tkdrg/hiasl

2014-11-03 17:26:53 -08:00

clothing

Merge pull request #5460 from paprka/rdturtle

2014-11-03 18:18:18 -08:00

crafting

moved files and fixed tablecrafting

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

detectivework

removes useless spawn

2014-10-26 14:35:27 -07: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 #5427 from paprka/littlejanitorthings

2014-11-03 17:19:37 -08:00

holiday

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

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

hydroponics

Merge pull request #5494 from phil235/BiogenFullFix1

2014-11-03 17:23:41 -08:00

library

Conflicts solving

2014-11-04 20:24:52 +01:00

mining

Merge pull request #5569 from Menshin/runtimes_roundsup

2014-11-03 17:13:18 -08:00

mob

Conflicts solving

2014-11-04 20:24:52 +01:00

nano

…

paperwork

Conflicts solving

2014-11-04 20:24:52 +01:00

power

Revert "Contaiment fields will now bounce off structures, machinery and mechs"

2014-11-04 00:51:58 -08:00

projectiles

Merge pull request #5520 from paprka/minerscrubs

2014-11-03 17:12:02 -08:00

reagents

Merge pull request #5512 from RemieRichards/AcidBurns

2014-11-03 18:11:49 -08:00

recycling

Merge pull request #5591 from hornygranny/OOPgularity3

2014-11-03 20:20:55 -06:00

research

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

2014-11-03 17:57:40 -08:00

scripting

…

security levels

…

shuttle

…

surgery

…

telesci

…