Tkdrg 8fce742d0a Merge remote-tracking branch 'upstream/master' into fuk ...

Conflicts:
	data/mode.txt
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi

2015-11-07 15:56:39 -03:00

..

grenades

Created a new flashbang sound and a ringing effect for when you go deaf, very realistic, it's almost like your ears are actually bleeding (NOTE: that is a joke, this isn't actually a painful sound, i checked)

2015-11-01 18:51:00 -08:00

implants

Hand of God Fixes/Tweaks

2015-11-07 15:25:28 -03:00

melee

Merge pull request #12834 from Incoming5643/supermatter_sword

2015-11-07 06:09:26 +03:00

storage

Revenant changes XVIII

2015-11-05 18:50:51 -05:00

tanks

Merge pull request #12686 from Firecage/jetpackobjective

2015-10-31 21:42:07 +03:00

AI_modules.dm

Typo fix

2015-10-22 11:20:48 -05:00

airlock_painter.dm

…

cards_ids.dm

…

chrono_eraser.dm

f u c k c o n f l i c t s

2015-09-25 14:35:44 +03:00

cigs_lighters.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

clown_items.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

cosmetics.dm

so we can still shave slime people.

2015-10-18 02:11:47 +02:00

courtroom.dm

…

defib.dm

Adds ghost alerts.

2015-10-27 23:07:41 -03:00

dice.dm

Changes up the dice selection method:

2015-10-11 12:06:18 -04:00

dna_injector.dm

Fixes winter coat hood sprite appearing as a bucket.

2015-10-17 16:29:11 +02:00

explosives.dm

…

extinguisher.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

flamethrower.dm

…

gift_wrappaper.dm

…

handcuffs.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

janisigns.dm

…

kitchen.dm

Replaced /proc/is_sharp() with /obj/item/proc/is_sharp().

2015-09-24 03:08:28 +01:00

manuals.dm

let's use the guide to chemistry wiki page instead.

2015-10-22 00:31:17 +02:00

mop.dm

Re-Adds Advanced Mop

2015-09-26 06:42:57 -04:00

paint.dm

…

paiwire.dm

…

pneumaticCannon.dm

Pneumatic Nerf

2015-10-19 12:52:17 -04:00

RCD.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

RPD.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

RSF.dm

…

scrolls.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

shields.dm

…

signs.dm

…

singularityhammer.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

stunbaton.dm

Fixes not being able to move during jaunting if you are cuffed and pulled.

2015-10-08 00:48:00 +02:00

teleportation.dm

Changed various instances of range() and orange() to ultra_range().

2015-10-19 20:04:14 +01:00

tools.dm

Replaced refactored is_hot() to be an atom proc.

2015-09-24 01:12:38 +01:00

twohanded.dm

Merge pull request #12687 from tkdrg/uncreative_branch_name

2015-10-28 19:30:22 +03:00

vending_items.dm

…

weaponry.dm

Adds a surgery to attach a chainsaw to your hand

2015-10-28 12:16:58 +13:00