Markolie d4e5149389 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fluff ...

Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm

2015-09-26 05:12:52 +02:00

..

grenades

Pass III

2015-09-18 21:15:08 -04:00

implants

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

2015-09-26 05:12:52 +02:00

melee

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

storage

Borg Update: MMI and Suits

2015-09-17 06:50:24 -04:00

tanks

Merge remote-tracking branch 'origin/master' into bay_examine

2015-09-15 14:08:36 -07:00

AI_modules.dm

upgradeable recycler

2015-09-04 19:41:42 -04:00

alien_specific.dm

…

cards_ids.dm

Fluff item clean-up

2015-09-25 04:31:30 +02:00

cash.dm

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

caution.dm

…

chrono_eraser.dm

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

cigs.dm

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

clown_items.dm

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

cosmetics.dm

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

courtroom.dm

…

defib.dm

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

dice.dm

…

disks.dm

Updates Nuke Disk Spawning

2015-07-24 17:33:25 -04:00

dna_injector.dm

Add new variable instead of using blocked

2015-08-29 03:25:35 +02:00

dnascrambler.dm

…

explosives.dm

Fixes up a few Destroys

2015-09-18 04:20:02 -04:00

extinguisher.dm

-tg- SpaceMove update

2015-09-25 15:53:59 -07:00

fireworks.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

flamethrower.dm

Pass I

2015-09-04 05:18:48 -04:00

game_kit.dm

…

gift_wrappaper.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

handcuffs.dm

Merge pull request #2068 from Markolie/lawstate

2015-09-16 19:07:29 -04:00

holosign.dm

…

hydroponics.dm

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

kitchen.dm

Changes a Chemistry Transfer Proc

2015-09-22 05:56:49 -04:00

legcuffs.dm

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

lighters.dm

Fluff item clean-up

2015-09-25 04:31:30 +02:00

manuals.dm

Fluff item clean-up

2015-09-25 04:31:30 +02:00

misc.dm

Pass I

2015-09-04 05:18:48 -04:00

module.dm

…

mop.dm

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

paint.dm

Pass I

2015-09-04 05:18:48 -04:00

paiwire.dm

…

power_cells.dm

Temperature gun update

2015-09-13 21:05:23 +02:00

RCD.dm

Pass I

2015-09-04 05:18:48 -04:00

RSF.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

scrolls.dm

-tg- buckling system

2015-09-24 15:52:10 -07:00

shards.dm

Pass I

2015-09-04 05:18:48 -04:00

shields.dm

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

signs.dm

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

soap.dm

…

staff.dm

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

stock_parts.dm

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

stunbaton.dm

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

surgery_limbattachment.dm

…

swords_axes_etc.dm

Replace magic intent words with defines, grab fixes

2015-09-07 11:51:00 -07:00

syndie_uplink.dm

Pass I

2015-09-04 05:18:48 -04:00

syndie.dm

…

table_rack_parts.dm

materials-consitency

2015-09-12 16:22:39 -04:00

tape.dm

…

teleportation.dm

Implant fixes/updates

2015-09-23 02:51:33 +02:00

tools.dm

-tg- buckling system

2015-09-24 15:52:10 -07:00

twohanded.dm

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

vending_items.dm

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

weaponry.dm

Implement remove_item_from_storage properly, syndi toolbox tool color update

2015-09-16 01:54:34 +02:00

wires.dm

Pass I

2015-09-04 05:18:48 -04:00