oranges 5c3a311dd4 Merge remote-tracking branch 'upstream/master' into Appendifixis ...

Conflicts:
	code/modules/surgery/appendectomy.dm

2015-08-05 13:58:21 +12:00

..

admin

Changelog

2015-08-04 00:14:24 +03:00

assembly

Fixes proc arguments

2015-07-15 23:52:35 +02:00

awaymissions

Renamed "glass case" -> "implant case". Changed implant syndiekit to be less FUCKS.

2015-08-01 01:56:54 +03:00

client

Merge pull request #10908 from Jordie0608/sqlstandsforseriouslyquestionablelogic

2015-07-29 21:35:28 +10:00

clothing

Merge pull request #10952 from phil235/BartenderSecPhotoFix

2015-08-02 07:20:45 -05:00

crafting

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

2015-07-21 05:32:08 -07:00

detectivework

Adds molotov creation recipe via tablecrafting, requring a drink bottle and a rag

2015-07-19 04:12:30 -07:00

emoji

…

events

Preventative appendectomy prevents appendicitis

2015-08-03 15:13:00 +03:00

flufftext

Added a new medication, Miner's Salve

2015-07-24 19:04:55 -04:00

food&drinks

Surgery, Implants and Organs rework: Phase 1

2015-07-31 22:18:31 +03:00

games

Fixes proc arguments

2015-07-15 23:52:35 +02:00

holiday

buffs out a few of the bigger holidays celibration periods

2015-07-24 13:21:02 -04:00

html_interface

Modifications to crew monitoring computer, procqueue and html_interface.

2015-07-12 13:37:18 +02:00

hydroponics

Rice hat by scones

2015-07-30 21:13:43 +10:00

library

Fixes proc arguments

2015-07-15 23:52:35 +02:00

lighting

Fixes proc arguments

2015-07-15 23:52:35 +02:00

mining

Merge pull request #10957 from Core0verload/surgery-organs-implants

2015-08-04 21:45:02 +10:00

mob

Merge pull request #10990 from RemieRichards/StorageUnequipUsability

2015-08-05 00:07:01 +02:00

nano

Fixes proc arguments

2015-07-15 23:52:35 +02:00

ninja

Merge pull request #10957 from Core0verload/surgery-organs-implants

2015-08-04 21:45:02 +10:00

paperwork

Fixes proc arguments

2015-07-15 23:52:35 +02:00

power

Merge pull request #10658 from xxalpha/fixsomething

2015-07-23 01:50:05 +02:00

procedural mapping

Fixes proc arguments

2015-07-15 23:52:35 +02:00

projectiles

Merge pull request #10970 from phil235/SyringeProjShieldBlockFix

2015-08-03 05:28:28 +01:00

reagents

Merge pull request #10955 from Core0verload/ghostnotify

2015-08-03 05:24:26 +01:00

recycling

Fixes non carbon being stunned when thrown and hitting something dense.

2015-07-26 20:40:46 +02:00

research

Merge pull request #10957 from Core0verload/surgery-organs-implants

2015-08-04 21:45:02 +10:00

scripting

Change many ERROR() calls into thrown exceptions

2015-07-23 08:19:08 -07:00

security levels

Fixes proc arguments

2015-07-15 23:52:35 +02:00

shuttle

Merge pull request #10798 from MrPerson/exceptions_to_help_phil_fix_potential_bugs_and_also_aran_maybe

2015-07-25 19:22:46 +10:00

surgery

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

2015-08-05 13:58:21 +12:00

telesci

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

2015-07-19 21:53:39 +02:00