xxalpha fda59dc3f5 Merge remote-tracking branch 'upstream/master' into n_u_c_l_e_a_r ...

Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

2015-09-09 02:41:34 +01:00

..

grenades

Removes minibomb suicide message. Fixes wand suicide message.

2015-09-02 23:07:40 -04:00

implants

makes all Destroy()'s return properly

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

melee

Fixes proc arguments

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

storage

Reworked nuke deconstruction. New nuke sprites. More++

2015-09-06 21:35:14 +01:00

tanks

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06: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

makes all Destroy()'s return properly

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

cigs_lighters.dm

Merge pull request #10834 from bgobandit/lighterfluff

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

clown_items.dm

ADDS EXTRA HONK

2015-09-03 14:34:53 -04: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

Squashed Commits

2015-06-27 00:09:16 -06:00

defib.dm

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06: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

Merge pull request #11341 from bgobandit/suicideisnotajoke

2015-09-06 06:42:00 +03: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

makes all Destroy()'s return properly

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

gift_wrappaper.dm

Made some changes and repathing for posters.

2015-09-04 18:30:58 -04: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

Fixes extinguisher (w/safety off) spraying water when placed on a table.

2015-05-23 16:03:48 +02:00

kitchen.dm

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

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

Merge pull request #11341 from bgobandit/suicideisnotajoke

2015-09-06 06:42:00 +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

Merge pull request #10163 from RemieRichards/TableCraftingUnFucking

2015-07-01 14:29:55 -04: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

Fixes proc arguments

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

tools.dm

t y p o h o n k

2015-09-04 22:21:51 -04:00

twohanded.dm

Adds/tweaks several suicide messages.

2015-08-23 15:02:34 -04: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