Mloc-Hibernia e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm

2014-05-11 13:19:09 +00:00

..

grenades

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

implants

Some more fixes.

2014-04-25 02:02:45 -05:00

melee

…

storage

Added storage/misc for objs that don't fit in

2014-05-04 00:40:08 +03:00

tanks

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

AI_modules.dm

Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.

2014-05-10 01:40:11 +09:30

cards_ids.dm

code/game/object/items/weapons/* lowercase pass

2014-01-08 19:56:00 +00:00

cigs_lighters.dm

Merge remote-tracking branch 'upstream/master' into dev

2014-05-07 17:37:29 +01:00

clown_items.dm

…

cosmetics.dm

code/game/object/items/weapons/* lowercase pass

2014-01-08 19:56:00 +00:00

dice.dm

…

dna_injector.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

explosives.dm

…

extinguisher.dm

…

flamethrower.dm

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

game_kit.dm

…

gift_wrappaper.dm

Fixes admin attack logs to show up in-game as well as in the logfiles.

2014-02-25 20:36:46 +00:00

handcuffs.dm

Wearing masks or straight jackets blocks chewing on your wrists

2014-03-03 20:24:09 -06:00

hydroponics.dm

…

kitchen.dm

code/game/object/items/weapons/* lowercase pass

2014-01-08 19:56:00 +00:00

manuals.dm

Merge remote-tracking branch 'upstream/master' into dev

2014-05-11 13:19:09 +00:00

mop.dm

…

paint.dm

Makes mixing paints actually make sense

2014-01-12 12:04:18 +01:00

paiwire.dm

…

power_cells.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

RCD.dm

RCDs no longer create plating with air on it.

2014-01-08 17:50:59 -07:00

RSF.dm

…

scrolls.dm

…

shields.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

stunbaton.dm

Fixes admin attack logs to show up in-game as well as in the logfiles.

2014-02-25 20:36:46 +00:00

surgery_limbattachment.dm

…

surgery_tools.dm

Added laser scalpel items

2014-02-25 15:09:46 -05:00

swords_axes_etc.dm

Telescopic robuster no longer has the stun

2014-03-18 18:30:08 +02:00

syndie.dm

…

table_rack_parts.dm

…

teleportation.dm

…

tools.dm

Merge remote-tracking branch 'upstream/master' into dev

2014-05-05 22:22:01 +01:00

twohanded.dm

…

weaponry.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

wires.dm

…