Lokiamis 544c39f7c2 salvage ...

Conflicts:
	code/game/jobs/access.dm
	code/game/objects/items/weapons/cards_ids.dm
	maps/tgstation.2.1.0.0.1.dmm

2014-02-16 10:38:52 -05:00

..

grenades

Standardize CLUMSY

2014-01-21 22:49:22 -05:00

implants

Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR.

2014-01-28 15:30:20 -05:00

melee

Generic attack sounds for all melee weapons

2014-01-22 10:15:43 -05:00

storage

Generic attack sounds for all melee weapons

2014-01-22 10:15:43 -05:00

tanks

Generic attack sounds for all melee weapons

2014-01-22 10:15:43 -05:00

AI_modules.dm

Randomized lawset system + config options

2014-01-05 17:50:13 -05:00

alien_specific.dm

…

cards_ids.dm

salvage

2014-02-16 10:38:52 -05:00

cigs_lighters.dm

Updated ashtray code!

2013-12-22 06:36:27 -05:00

clown_items.dm

…

cosmetics.dm

…

defib.dm

Standardize LASER, NOCLONE, and HUSK

2014-01-21 22:59:53 -05:00

dice.dm

…

dna_injector.dm

Standardize LASER, NOCLONE, and HUSK

2014-01-21 22:59:53 -05:00

explosives.dm

More C4 suicide phrases. For no Raisin.

2014-01-26 14:45:16 -05:00

extinguisher.dm

Nerfed firing items from fire extinguishers, they now do double the damage compared to throwing them normally

2014-02-14 13:22:34 +01:00

flamethrower.dm

…

game_kit.dm

…

gift_wrappaper.dm

Adding checks for LAssailant everywhere whee

2013-12-23 04:57:44 -05:00

handcuffs.dm

Standardize CLUMSY

2014-01-21 22:49:22 -05:00

hydroponics.dm

Adding checks for LAssailant everywhere whee

2013-12-23 04:57:44 -05:00

kitchen.dm

Generic attack sounds for all melee weapons

2014-01-22 10:15:43 -05:00

manuals.dm

Reintroducing the dough-based cooking system.

2014-02-01 19:22:22 -05:00

mop.dm

…

ninja_manuscript.dm

…

paint.dm

…

paiwire.dm

…

power_cells.dm

Updated all suicide_act()s to use a new span class, 'suicide'.

2014-01-19 21:25:47 -05:00

RCD.dm

RCDs no longer create plating with air on it.

2014-01-09 20:26:28 -05:00

RCS.dm

…

RSF.dm

…

scrolls.dm

Magic Overhaul

2013-12-14 05:54:03 -05:00

shields.dm

Resolves #2213 Fixes the back icons for the scythe and the Roman shield.

2014-01-19 05:32:34 -05:00

stunbaton.dm

Added chem handling and IED recipe

2014-01-31 02:56:27 -05:00

surgery_limbattachment.dm

…

surgery_tools.dm

Standardize LASER, NOCLONE, and HUSK

2014-01-21 22:59:53 -05:00

swords_axes_etc.dm

fixed unfinished merge

2014-02-14 14:22:39 +01:00

syndie.dm

…

table_rack_parts.dm

…

teleportation.dm

…

tools.dm

using a welder with already damaged eyes no longer causes you to go blind

2014-02-14 13:48:46 +01:00

twohanded.dm

New stuff for mining

2014-02-16 03:54:39 -05:00

vending_items.dm

Vending machine

2013-11-26 07:36:04 -05:00

weaponry.dm

Generic attack sounds for all melee weapons

2014-01-22 10:15:43 -05:00

wires.dm

…