Mark Aherne 9b45dbabfb Continued work in progress on a major revision of the NanoUI templating system. ...

Conflicts:
	code/ATMOSPHERICS/components/omni_devices/filter.dm
	code/ATMOSPHERICS/components/omni_devices/mixer.dm
	code/game/dna/dna_modifier.dm
	code/game/machinery/cryo.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/modules/nano/nanoexternal.dm
	code/modules/nano/nanomanager.dm
	code/modules/nano/nanoui.dm
	code/modules/power/apc.dm
	code/modules/power/smes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	nano/css/shared.css
	nano/js/nano_update.js
	nano/templates/escape_pod_console.tmpl

2014-07-15 07:22:15 -04:00

..

grenades

Fixes human internal organs list

2014-07-13 08:51:55 -04:00

implants

TC use count appears on round end

2014-05-30 20:28:35 +02:00

melee

Separates the sharp flag into edge and sharp

2014-06-17 06:51:51 -04:00

storage

Made monkey cube subtypes define what type of monkey they spawn instead of weird switch in Expand().

2014-06-24 12:02:29 -04:00

tanks

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-15 07:22:15 -04:00

AI_modules.dm

Changed drone laws to be more VG like

2014-05-13 02:44:31 +02:00

alien_specific.dm

Smoke rework caused endless loops, reverted.

2014-04-08 01:47:56 +02:00

cards_ids.dm

The death of assistants. Long live civilians!

2014-06-27 17:57:18 -04:00

cash.dm

Part 1 of economy rework: Spacecash refactor - See commit for full changelog.

2014-04-19 20:47:41 -04:00

cigs_lighters.dm

You forgot 2 commas, NOW I'm annoyed :D

2014-06-09 01:23:12 -04:00

clown_items.dm

Stops buckled mobs from slipping (for now)

2014-07-13 06:48:17 -04:00

cosmetics.dm

Added electric razors to the barber shop

2013-11-23 23:06:38 -05:00

defib.dm

Standardize LASER, NOCLONE, and HUSK

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

dice.dm

Adds sharp and edge flags to appropriate items

2014-06-17 07:08:25 -04:00

dna_injector.dm

Runtime fix / removing extra testing messages

2014-06-17 00:16:59 -04:00

explosives.dm

Trying to cut down on attack lock spam

2014-05-24 17:17:38 -04:00

extinguisher.dm

Send more stuff to attack log rather than admin log.

2014-06-20 13:42:42 -04:00

flamethrower.dm

Garbage collection fixes

2014-02-19 20:24:31 -05:00

game_kit.dm

…

gift_wrappaper.dm

Adding checks for LAssailant everywhere whee

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

handcuffs.dm

Fixed up the stupid handcuff shit that's been bugging me forever.

2014-06-17 10:26:04 -04:00

hydroponics.dm

Adding checks for LAssailant everywhere whee

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

kitchen.dm

removes sharpness from forks

2014-07-13 08:59:41 -04:00

manuals.dm

Space Law book link fix

2014-06-16 14:04:17 +01:00

mop.dm

Well-used corridors become dirty with time

2013-11-21 21:41:32 -05:00

ninja_manuscript.dm

Hydro+Xenoarch+Sprites

2013-11-01 23:46:37 -04:00

paint.dm

Nextgen lighting #2: Lights

2014-06-20 12:07:46 -04:00

paiwire.dm

…

power_cells.dm

Fix secborg tasers

2014-05-26 16:29:03 -04:00

RCD.dm

rebalanced Borg/mounted RCD

2014-04-09 22:52:31 +02:00

RCS.dm

Garbage collection fixes

2014-02-19 20:24:31 -05:00

RSF.dm

Pretty much all new click code

2013-10-12 14:44:36 -04:00

scrolls.dm

Smoke rework caused endless loops, reverted.

2014-04-08 01:47:56 +02: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

Changing power numbers to balance gun upgrades

2014-05-01 16:23:09 -04:00

surgery_limbattachment.dm

…

surgery_tools.dm

Separates the sharp flag into edge and sharp

2014-06-17 06:51:51 -04:00

swords_axes_etc.dm

fixed unfinished merge

2014-02-14 14:22:39 +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 human internal organs list

2014-07-13 08:51:55 -04:00

twohanded.dm

Separates the sharp flag into edge and sharp

2014-06-17 06:51:51 -04:00

vending_items.dm

Vending machine

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

weaponry.dm

Adds sharp and edge flags to appropriate items

2014-06-17 07:08:25 -04:00

wires.dm

…