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

Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi

2015-02-05 17:44:22 -08:00

..

grenades

grenades now add up the temperature of contained beakers when mixing

2015-02-04 18:59:18 -08: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 clothessec

2015-02-05 17:44:22 -08:00

tanks

Repath all non jetpack tank types to tank/internals

2015-02-01 18:25:39 +00: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

fixes ert access

2015-02-02 06:22:07 -08:00

chrono_eraser.dm

Fixes issues with the chronosuit and TED.

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

cigs_lighters.dm

fix shit, make bible suicide sacrifice you to your deity

2015-02-02 15:13:17 -05: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

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

Fixes the font issues, removes 3 mutations R.I.P

2015-01-22 17:28:13 -08: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

Repath all non jetpack tank types to tank/internals

2015-02-01 18:25:39 +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

fix shit, make bible suicide sacrifice you to your deity

2015-02-02 15:13:17 -05: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

adds key spawning and stuff

2015-01-21 18:39:17 -08:00

paint.dm

Refactored the code to remove most icon operations for changing an icon's colour. I had to manually set all the icons, which are subject to colour change, to be have a white/grey icon, so that the colours added properly, and then have them coloured in the code. This means the icons for runes, the reagent beaker overlay, smoke and etc will all be white. They now all use the new 500+ color variable.

2014-01-15 21:30:55 +00:00

paiwire.dm

pAIs added. Two on station (Crew Quarters, R&D Director's Office) and one on the Derelict.

2011-05-30 19:33:28 +00:00

power_cells.dm

updates to ERT stuff

2015-02-02 03:33:37 -08:00

RCD.dm

updates to ERT stuff

2015-02-02 03:33:37 -08:00

RPD.dm

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

2015-01-19 01:53:19 +01:00

RSF.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

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

framework for a future "suicide hotline" job

2015-02-01 19:44:54 -05: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