Markolie 1d6754728b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates ...

# Conflicts:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi

2017-02-06 20:37:03 +01:00

..

grenades

Fixes Iconless Banana Peels

2017-02-05 06:43:14 -05:00

implants

Polishes up the reset_view proc, which is basically

2016-12-21 17:56:57 -08:00

melee

Added Bubblegum. Added dismemberment chance to bullets, and made changes to GPS tracking.

2016-10-25 00:50:31 +02:00

storage

last fixes, hopefully

2017-02-04 04:28:42 -05:00

tanks

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

AI_modules.dm

…

alien_specific.dm

Fully rips out cyborg sight modules

2017-01-10 00:32:11 -08:00

bee_briefcase.dm

even more work

2017-01-22 08:11:31 -05:00

cards_ids.dm

added cargo ID skin to agent ID and ID Computer

2017-02-05 09:19:52 +04:00

cash.dm

…

caution.dm

- 180 Reverse, Mines now banned from surplus

2016-12-20 10:09:38 +00:00

chrono_eraser.dm

…

cigs.dm

Merge remote-tracking branch 'upstream/master' into botany-rework

2017-01-26 06:53:18 -05:00

clown_items.dm

fixes, comfrey, and aloe

2017-01-23 05:25:42 -05:00

cosmetics.dm

…

courtroom.dm

…

defib.dm

added it to defib, cloning, strange reagent

2017-01-12 19:44:18 +04:00

dice.dm

e20 get logged

2016-11-20 01:42:22 +01:00

disks.dm

sprite and code fixes

2017-01-22 23:25:56 -05:00

dna_injector.dm

Switches over to the new system

2017-01-17 13:57:07 +01:00

dnascrambler.dm

Fixes DNA scrambler not having an icon

2016-09-11 23:44:27 -04:00

explosives.dm

…

extinguisher.dm

…

fireworks.dm

…

flamethrower.dm

…

garrote.dm

Fixes a garrote runtime

2017-01-10 18:28:40 -08:00

gift_wrappaper.dm

Botany Rework

2017-01-21 18:28:03 -05:00

handcuffs.dm

Added Legion megafauna, updated weather and some minor other refactors/changes.

2016-10-24 02:16:45 +02:00

holosign.dm

…

holy_weapons.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-27 17:28:14 +01:00

kitchen.dm

even more work

2017-01-22 08:11:31 -05:00

legcuffs.dm

…

lighters.dm

…

manuals.dm

…

misc.dm

…

mop.dm

…

paint.dm

…

paiwire.dm

…

pneumaticCannon.dm

…

power_cells.dm

more fixes

2017-01-23 00:53:44 -05:00

powerfist.dm

Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions

2017-02-06 19:55:37 +01:00

RCD.dm

matter_is_neither_created_nor_destroyed

2017-01-16 00:54:56 -06:00

RSF.dm

…

scissors.dm

Ports over the status effect unification

2016-10-23 15:45:35 -07:00

scrolls.dm

…

shards.dm

…

shields.dm

…

signs.dm

…

soap.dm

…

staff.dm

…

stock_parts.dm

…

stunbaton.dm

weight adjustment

2017-01-16 22:35:29 -05:00

swords_axes_etc.dm

…

syndie_uplink.dm

…

table_rack_parts.dm

…

tape.dm

…

teleportation.dm

…

teleprod.dm

…

tools.dm

…

twohanded.dm

Fix resource identifiers

2017-01-31 17:45:46 +01:00

vending_items.dm

Tweak: Mr Chang's vending machine now refillable

2017-02-02 15:49:27 +00:00

weaponry.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates

2017-02-06 20:37:03 +01:00

whetstone.dm

…

wires.dm

…