Mloc-Hibernia 51d2451c01 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

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

Conflicts:
	nano/templates/geoscanner.tmpl

2014-07-18 13:15:30 +00:00

..

grenades

Fixes human internal organs list

2014-07-12 16:15:37 -04:00

implants

Fixed a small mistake..

2014-07-14 19:14:38 -04:00

melee

Separates the sharp flag into edge and sharp

2014-06-15 20:25:39 -04:00

storage

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

2014-06-20 22:02:40 +01:00

tanks

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

2014-07-11 10:48:42 +01:00

AI_modules.dm

Fix infinite loop in freeform AI module

2014-06-25 23:09:21 +04:00

cards_ids.dm

New vehicle framework

2014-06-03 22:18:49 +12:00

cigs_lighters.dm

Fix lighter burning random body parts

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

clown_items.dm

Stops buckled mobs from slipping (for now)

2014-07-02 22:36:49 +02:00

cosmetics.dm

…

dice.dm

Adds sharp and edge flags to appropriate items

2014-06-16 13:26:44 -04:00

dna_injector.dm

…

explosives.dm

…

extinguisher.dm

Thrown items can be targeted, has miss chance...

2014-07-15 01:14:04 -04:00

flamethrower.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

game_kit.dm

…

gift_wrappaper.dm

…

handcuffs.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into robust-squash

2014-06-29 19:16:36 +04:00

hydroponics.dm

Hydroponics refactor, part 1: Files.

2014-06-11 03:44:29 +01:00

kitchen.dm

should fix #5618, trivial kitchen utensil bug

2014-07-16 20:28:19 +02:00

manuals.dm

Merge pull request #5603 from DJSnapshot/hotfix

2014-07-14 07:12:37 +04:00

mop.dm

…

paint.dm

Nextgen lighting #2: Lights

2014-06-18 20:38:33 +04:00

paiwire.dm

…

power_cells.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

RCD.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

RSF.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

scrolls.dm

…

shields.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

stunbaton.dm

Implemented suggestions from PR

2014-06-29 19:24:19 +04:00

surgery_limbattachment.dm

…

surgery_tools.dm

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

swords_axes_etc.dm

…

syndie.dm

…

table_rack_parts.dm

…

teleportation.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

tools.dm

Fixes human internal organs list

2014-07-12 16:15:37 -04:00

twohanded.dm

Stunbatons now run on charge.

2014-06-29 17:46:06 +04:00

weaponry.dm

Implemented suggestions from PR

2014-06-29 19:24:19 +04:00

wires.dm

…