paprka 30348d8cdd Merge branch 'master' of https://github.com/tgstation/-tg-station into holster ...

Conflicts:
	code/game/objects/items/weapons/storage/belt.dm

2015-01-23 16:48:30 -08:00

..

grenades

replaces all instances of pacid with facid

2015-01-21 20:17:23 -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 holster

2015-01-23 16:48:30 -08:00

tanks

Merge pull request #6598 from Incoming5643/InstantSummons

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

AI_modules.dm

…

airlock_painter.dm

…

cards_ids.dm

MoreRefinment

2015-01-23 02:19:17 +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

…

cosmetics.dm

…

defib.dm

ERTBalancePassV1

2015-01-18 19:18:47 +08: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

…

extinguisher.dm

…

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

…

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

fixes the kinetic accellerator dying

2015-01-19 01:29:52 -08: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

* Cleaned the disposals code a bit (making it uses the defines !)

2015-01-19 01:53:19 +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

…

teleportation.dm

…

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

…