Jordie0608 4a82ff1564 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew() ...

Conflicts:
	code/modules/reagents/reagent_containers/bottle.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/syringes.dm

2015-01-21 16:54:40 +11:00

..

grenades

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

implants

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

melee

Conflicts resolution

2014-12-29 11:49:30 +03:00

storage

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

2015-01-21 16:54:40 +11:00

tanks

Merge pull request #6598 from Incoming5643/InstantSummons

2015-01-09 03:29:15 -03:00

AI_modules.dm

Fixes the new AI lawcap config option

2014-12-02 18:27:06 -03:00

airlock_painter.dm

Hopefully final pass of object -> mob examine switch

2014-08-20 07:07:30 -07:00

cards_ids.dm

EmergencyResponseTeamV2

2015-01-11 19:21:38 +08:00

chrono_eraser.dm

Fixes issues with the chronosuit and TED.

2015-01-15 13:32:21 -05:00

cigs_lighters.dm

Increases the cigarette chemical cap as per request by @Miauw62

2015-01-12 19:01:52 -08:00

clown_items.dm

Fixes the mouth washing message and the cleaning message appearing at the same time.

2014-11-12 17:37:27 +01:00

cosmetics.dm

Fix being able to apply lipstick through masks and items covering the mouth.

2014-11-01 13:28:32 +01:00

defib.dm

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00

dice.dm

Fixes runtime linked to diceroll proc

2014-12-31 20:47:32 +01:00

dna_injector.dm

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

explosives.dm

Fix of c4 not deleting on signaler explosions

2014-12-16 00:47:09 +03:00

extinguisher.dm

Conflicts:

2014-11-13 17:33:32 +01:00

flamethrower.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

gift_wrappaper.dm

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

handcuffs.dm

Made clumsiness into disability

2014-12-14 08:04:48 +03:00

janisigns.dm

Fixes the holosign projector making signs when put into storage, generalizes can_be_placed_into and improves the check in objects that use it.

2015-01-07 01:09:58 -07:00

kitchen.dm

Makes butcher's cleaver a child of kitchen knife

2015-01-05 17:23:03 -05:00

manuals.dm

Americanised the Manual

2015-01-10 23:28:41 +11:00

mop.dm

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

2014-12-27 21:54:53 -08:00

paint.dm

…

paiwire.dm

…

power_cells.dm

Finished the exofab revamp:

2014-12-02 23:00:22 +01:00

RCD.dm

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

RPD.dm

* Prevent stacking of dense disposal constructs (bin, outlet, chute)

2015-01-15 20:05:15 +01:00

RSF.dm

…

scrolls.dm

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

shields.dm

Conflict fix

2014-12-21 06:12:33 +03:00

singularityhammer.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

stunbaton.dm

Conflict fix

2014-12-21 06:12:33 +03:00

table_rack_parts.dm

Conflicts:

2014-11-13 17:33:32 +01:00

teleportation.dm

Prevent using the hand teleporter from inside closets and when under the influence of a chameleon projector.

2014-12-15 00:08:03 +01:00

tools.dm

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

twohanded.dm

Fixes some bugs and rutimes tkdrg pointed

2015-01-08 22:35:07 +03:00

vending_items.dm

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

2014-12-22 16:19:43 -03:00

weaponry.dm

Fixes up some silly problems with cursed items:

2014-09-15 19:22:25 -04:00