Erthilo 3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm

2013-09-02 23:32:33 +01:00

..

grenades

Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work.

2013-08-31 20:12:19 +01:00

implants

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

melee

…

storage

Fixes for monkeycubes.

2013-09-02 17:44:47 +01:00

tanks

Vox gear tweaks. Dartgun buff, removal of tank sounds, addition of multitools.

2013-07-29 06:43:37 -07:00

AI_modules.dm

Rename of cyborgs to robots (in strings), addition of robot spawn name-choosing proc, addition of method for removing robot brain.

2013-02-25 19:48:00 -08:00

cards_ids.dm

Added Megaphones to all Heads offices.

2013-08-31 22:14:31 +01:00

cigs_lighters.dm

…

clown_items.dm

…

cosmetics.dm

…

dice.dm

…

dna_injector.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

explosives.dm

Removed undeeded "ATTACK:"

2013-08-28 03:37:11 +01:00

extinguisher.dm

Fully reverts clickdelay change.

2013-08-13 13:10:09 +01:00

flamethrower.dm

Fixes issues:

2013-04-18 09:56:49 -07:00

game_kit.dm

…

gift_wrappaper.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

handcuffs.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

hydroponics.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

kitchen.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

manuals.dm

Uncomments books. Generifies mentions of tg or baystation.

2013-09-02 18:24:11 +01:00

mop.dm

Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work.

2013-08-31 20:12:19 +01:00

paint.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

paiwire.dm

…

power_cells.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

RCD.dm

Fully reverts clickdelay change.

2013-08-13 13:10:09 +01:00

RSF.dm

…

scrolls.dm

…

shields.dm

…

stunbaton.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

surgery_limbattachment.dm

…

surgery_tools.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

swords_axes_etc.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

syndie.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

table_rack_parts.dm

…

teleportation.dm

…

tools.dm

Fixes issue #3240. The order for visible_message is visible, person, audible. Here, visible and person were reversed.

2013-07-04 21:13:33 -07:00

twohanded.dm

…

weaponry.dm

Removed undeeded "ATTACK:"

2013-08-28 03:37:11 +01:00

wires.dm

…