Markolie 50a176571a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise ...

Conflicts:
	maps/cyberiad.dmm

2014-12-18 17:13:18 +01:00

..

grenades

Fixes-Tweakes

2014-12-14 03:18:10 -05:00

implants

Replace every instance of NanoTrasen with Nanotrasen.

2014-11-29 21:01:29 +01:00

melee

Melee Rebalancing

2014-12-18 10:22:02 -05:00

storage

Bug fixes

2014-12-17 21:56:37 +01:00

tanks

Vox and Space

2014-12-09 03:47:46 -05:00

AI_modules.dm

Replace every instance of NanoTrasen with Nanotrasen.

2014-11-29 21:01:29 +01:00

alien_specific.dm

Stunning Changes

2014-12-06 02:33:31 -05:00

cards_ids.dm

Bug fixes, wording changes

2014-11-25 22:56:12 +01:00

cash.dm

…

cigs_lighters.dm

Replace every instance of NanoTrasen with Nanotrasen.

2014-11-29 21:01:29 +01:00

clown_items.dm

Janitor Rework

2014-11-10 03:17:56 -05:00

cosmetics.dm

…

defib.dm

Defib Unit

2014-12-15 04:55:02 -05:00

dice.dm

Adds sharp and edge flags to appropriate items

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

dna_injector.dm

Fix DNA Injectors with abilities, adds mob's name to autopsy data

2014-11-28 21:14:00 +01:00

dnascrambler.dm

Traitor Gear and Balance

2014-10-28 01:35:03 -04:00

explosives.dm

Nuke-Ops-Final

2014-11-06 07:29:16 -05:00

extinguisher.dm

Weapon Changes

2014-11-30 08:18:29 -05:00

flamethrower.dm

…

game_kit.dm

…

gift_wrappaper.dm

…

handcuffs.dm

Icon Fixes

2014-12-15 19:05:13 -05:00

hydroponics.dm

Hydroponics rewrite, details will be in PR. Big commit.

2014-07-25 11:10:01 -04:00

kitchen.dm

Weapon Changes

2014-11-30 08:18:29 -05:00

manuals.dm

nanotrasen.se

2014-09-04 19:45:43 +02:00

mop.dm

Weapon Changes

2014-11-30 08:18:29 -05:00

ninja_manuscript.dm

…

paint.dm

Nextgen lighting #2: Lights

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

paiwire.dm

…

power_cells.dm

Adds constructable and upgradeable machinery, fixes the RPED, other minor fixes

2014-11-17 08:32:39 +01:00

RCD.dm

Melee Rebalancing

2014-12-18 10:22:02 -05:00

RSF.dm

…

scrolls.dm

…

shards.dm

Compile fix

2014-08-16 21:45:36 -04:00

shields.dm

Weapon description update

2014-11-22 13:33:25 -05:00

stunbaton.dm

Icon Fixes

2014-12-15 19:05:13 -05: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

Melee Rebalancing

2014-12-18 10:22:02 -05:00

syndie.dm

…

table_rack_parts.dm

…

teleportation.dm

Additional constructable and upgradeable machines, adds soap to drones, updates teleporter

2014-11-18 03:13:12 +01:00

tools.dm

Melee Rebalancing

2014-12-18 10:22:02 -05:00

twohanded.dm

Melee Rebalancing

2014-12-18 10:22:02 -05:00

vending_items.dm

Add clothing vendors to cargo, fix syndiborg/dsborg, laptop fix, other minor fixes

2014-12-07 04:55:48 +01:00

weaponry.dm

Icon Fixes

2014-12-15 19:05:13 -05:00

wires.dm

…