CosmicScientist 2844c80ed5 Fixing merge conflicts

2015-08-08 15:43:38 +01:00

..

admin

Admins can now use marked objs with atom proc call

2015-08-04 19:10:00 -07:00

assembly

…

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

Fixing merge conflicts

2015-08-08 15:43:38 +01:00

crafting

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

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

detectivework

…

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

…

holiday

buffs out a few of the bigger holidays celibration periods

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

html_interface

…

hydroponics

Rice hat by scones

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

library

…

lighting

…

mining

Merge pull request #10967 from astralenigma/digfix

2015-08-05 14:35:39 +10:00

mob

Fixing merge conflicts

2015-08-08 15:43:38 +01:00

nano

…

ninja

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

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

paperwork

…

power

Merge pull request #10658 from xxalpha/fixsomething

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

procedural mapping

…

projectiles

Fixes runtime when firer is null.

2015-08-07 15:54:21 +02:00

reagents

Changes uranium to radium

2015-08-06 14:26:48 -04:00

recycling

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

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

research

Design Datum fix

2015-08-05 12:48:51 -04:00

scripting

Change many ERROR() calls into thrown exceptions

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

security levels

…

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 pull request #10988 from PatchouliKnowledge/Appendifixis

2015-08-05 05:38:46 -05:00

telesci

…