bgobandit 8e82cf324a Merge branch 'master' of https://github.com/bgobandit/-tg-station into boxshit ...

Conflicts:
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm

2015-10-02 00:41:19 -04:00

..

grenades

Copy of Anonus' Blob tweak PR, with less commits.

2015-09-15 16:03:55 +02:00

implants

Cleans up the implant.dm by splitting it up into multiple files with only generic implant files being in implant.dm now.

2015-09-21 17:56:58 +01:00

melee

Merge branch 'edgy' into hot_or_not

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

storage

Merge branch 'master' of https://github.com/bgobandit/-tg-station into boxshit

2015-10-02 00:41:19 -04:00

tanks

Merge pull request #11700 from feemjmeem/suicides-sep10

2015-09-16 23:57:51 +02:00

AI_modules.dm

Merge remote-tracking branch 'tgstation/master' into point-zero

2015-09-12 21:07:40 +09:00

airlock_painter.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

cards_ids.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

chrono_eraser.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

cigs_lighters.dm

Merge pull request #11964 from Delimusca/durrymunchin

2015-09-24 22:26:22 -05:00

clown_items.dm

Merge pull request #11749 from feemjmeem/suicides-sep12

2015-09-24 01:33:27 +03:00

cosmetics.dm

Fixes runtime with do_after()'s that don't use a target.

2015-06-25 19:05:23 +02:00

courtroom.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

defib.dm

Syndicate medical cyborgs

2015-09-17 20:02:48 -04:00

dice.dm

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

2015-07-19 21:53:39 +02:00

dna_injector.dm

Fixes not being able to save the dna of corpses in the dna console.

2015-09-26 18:04:35 +02:00

explosives.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

extinguisher.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

flamethrower.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

gift_wrappaper.dm

Made some changes and repathing for posters.

2015-09-04 18:30:58 -04:00

handcuffs.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

janisigns.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

kitchen.dm

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

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

manuals.dm

Readding loading chef food into snack vending mechines.

2015-07-23 16:06:03 +02:00

mop.dm

Merge pull request #11685 from bgobandit/fuckingprogressbarsfuck

2015-09-13 17:30:50 +02:00

paint.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

paiwire.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

pneumaticCannon.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

RCD.dm

Merge remote-tracking branch 'tgstation/master' into point-zero

2015-09-12 21:07:40 +09:00

RPD.dm

Merge branch 'hemanifolds' of https://github.com/duncathan/-tg-station into duncathan-hemanifolds

2015-09-25 16:35:08 +03:00

RSF.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

scrolls.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

shields.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

signs.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

singularityhammer.dm

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00

stunbaton.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

teleportation.dm

Cleans up the implant.dm by splitting it up into multiple files with only generic implant files being in implant.dm now.

2015-09-21 17:56:58 +01:00

tools.dm

Replaced refactored is_hot() to be an atom proc.

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

twohanded.dm

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

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

vending_items.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

weaponry.dm

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

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