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

Conflicts:
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/projectiles.dmi

2015-01-15 02:30:31 -05:00

..

grenades

* OOP'ed ear damages/deafness status updating

2015-01-13 00:40:46 +01:00

implants

Replaces a bunch of input() with stripped_input()

2015-01-11 19:02:53 -03:00

melee

Conflicts resolution

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

storage

Requested changes by @Cheridan

2015-01-12 20:38:56 -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

Revert "[FEATURE] Emergency Response Team"

2015-01-10 19:55:30 -03:00

chrono_eraser.dm

Adds Timeline Eradication Device

2015-01-15 02:18:04 -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

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

General fixes of bugs caused by mutations

2015-01-06 15:38:40 +03:00

explosives.dm

…

extinguisher.dm

…

flamethrower.dm

SubSystem rewrite

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

gift_wrappaper.dm

…

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

…

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

…

RCD.dm

derp'd with the names

2015-01-04 00:36:04 +00:00

RPD.dm

Changes a missed del() to qdel()

2015-01-04 16:22:27 -03:00

RSF.dm

…

scrolls.dm

…

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

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

2015-01-04 01:52:14 +00: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

…