xxalpha 3f29a9866c Merge remote-tracking branch 'upstream/master' into qdelFixes ...

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm

2015-08-31 08:52:30 +01:00

..

grenades

Merge pull request #10668 from phil235/CyborgFlashFix

2015-07-20 11:53:03 -05:00

implants

Merge pull request #11162 from Core0verload/rnd-implants

2015-08-18 20:20:12 +01:00

melee

Fixes proc arguments

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

storage

Merge pull request #11380 from bgobandit/salicyclicassblastusa

2015-08-27 23:53:58 -05:00

tanks

Changes a lot of del() to qdel()

2015-08-16 23:33:22 +02:00

AI_modules.dm

Needs a check here to let reset and purge be used.

2015-07-20 09:02:46 -06:00

airlock_painter.dm

Fixes proc arguments

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

cards_ids.dm

Changed input method

2015-07-23 04:23:38 +01:00

chrono_eraser.dm

Fixes proc arguments

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

cigs_lighters.dm

Merge pull request #10834 from bgobandit/lighterfluff

2015-07-26 13:09:12 +03:00

clown_items.dm

I screwed up that merge

2015-08-14 21:36:35 -06:00

cosmetics.dm

…

courtroom.dm

…

defib.dm

Why was it capitalized

2015-08-16 10:08:08 -07: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

Attack logging tweaks

2015-07-08 23:14:37 -07:00

explosives.dm

Added qdel(wires) to a bunch of objects Destroy proc.

2015-08-27 11:10:58 +01:00

extinguisher.dm

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

2015-07-21 05:32:08 -07:00

flamethrower.dm

Fixes proc arguments

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

gift_wrappaper.dm

Fixes proc arguments

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

handcuffs.dm

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

2015-07-24 16:59:21 +08:00

janisigns.dm

…

kitchen.dm

…

manuals.dm

Readding loading chef food into snack vending mechines.

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

mop.dm

Removes dirt from walking on tiles

2015-08-24 11:33:52 +03:00

paint.dm

Fixes proc arguments

2015-07-15 23:52:35 +02: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

Changed some circuits paths to reduce copypasta

2015-08-30 16:58:13 +03:00

RPD.dm

Fixed cyborg modules, cyborg parts and cyborgs not qdelling properly.

2015-08-29 19:24:36 +01:00

RSF.dm

Fixes proc arguments

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

scrolls.dm

Fixes proc arguments

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

shields.dm

Fixes proc arguments

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

signs.dm

…

singularityhammer.dm

Fixes proc arguments

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

stunbaton.dm

Fixes proc arguments

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

teleportation.dm

Fixes proc arguments

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

tools.dm

Fixes lighter-related bugs.

2015-07-24 11:00:23 -04:00

twohanded.dm

Fixes proc arguments

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

vending_items.dm

Give refill canisters three separate charge values for standard, contraband(hacked) and premium(coin) items.

2015-07-22 22:06:04 +02:00

weaponry.dm

Fixes proc arguments

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