Markolie 182e546d6a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes ...

Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm

2015-08-30 00:38:03 +02:00

..

grenades

Consistent bomb logging

2015-08-17 01:01:30 +02:00

implants

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

2015-08-18 18:38:59 +02:00

melee

…

storage

R&D Lockbox Origintech

2015-08-25 21:24:09 -04:00

tanks

Admin teleport update, further admin message fixes

2015-08-18 00:54:25 +02:00

AI_modules.dm

Fix OneHuman law

2015-07-22 18:35:09 +02:00

alien_specific.dm

…

cards_ids.dm

Implement /vg/'s global asset cache

2015-08-21 18:47:00 +02:00

cash.dm

…

caution.dm

Re-Works Maintenance Loot

2015-06-04 18:53:13 -04:00

chrono_eraser.dm

The Great Del() Cull of 2015

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

cigs.dm

The Great Del() Cull of 2015

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

clown_items.dm

Ports over Airhorns

2015-08-06 00:42:17 -04:00

cosmetics.dm

Adds spraycans, fixes lipstick, modifies scleaner

2015-04-15 17:19:08 -07:00

courtroom.dm

…

defib.dm

Pass 3

2015-07-08 01:34:53 -04:00

dice.dm

Obtainable dice and D&D figures

2015-04-08 15:03:43 -07:00

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

Consolidate ?/FLW links under key_name_admin

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

extinguisher.dm

Reintegrate mob fire

2015-04-28 13:57:58 -07:00

fireworks.dm

The Great Del() Cull of 2015

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

flamethrower.dm

Admin jump overhaul, add watchlist functionality, other admin updates

2015-08-16 23:28:02 +02:00

game_kit.dm

…

gift_wrappaper.dm

The Great Del() Cull of 2015

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

grenades.dm

Pass II

2015-07-09 19:51:40 -04:00

handcuffs.dm

Fix cable coil sprite

2015-08-03 06:37:12 +02:00

holosign.dm

Cleanup /defines/ folder.

2015-05-09 16:06:59 -07:00

hydroponics.dm

Consolidate ?/FLW links under key_name_admin

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

kitchen.dm

ERT Rework - Code Changes

2015-07-20 19:37:56 -04:00

legcuffs.dm

Consolidate ?/FLW links under key_name_admin

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

lighters.dm

Fixes match attack proc and processing

2015-05-22 08:43:57 -04:00

manuals.dm

…

misc.dm

Cleanup /defines/ folder.

2015-05-09 16:06:59 -07:00

module.dm

Cleanup /defines/ folder.

2015-05-09 16:06:59 -07:00

mop.dm

The Great Del() Cull of 2015

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

paint.dm

…

paiwire.dm

…

power_cells.dm

Machine Upgrade Update

2015-08-20 21:03:19 -04:00

RCD.dm

Replace disabling RCD's with exploding them

2015-08-20 01:29:23 +02:00

RSF.dm

The Great Del() Cull of 2015

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

scrolls.dm

…

shards.dm

Fix ghosts triggering glass

2015-08-27 03:25:32 +02:00

shields.dm

…

signs.dm

…

soap.dm

Cleanup /defines/ folder.

2015-05-09 16:06:59 -07:00

staff.dm

Brooms, Stick-horses, and Flying Wizards!

2015-05-15 03:52:36 -04:00

stock_parts.dm

Preserves sanity

2015-08-20 21:38:00 -04:00

stunbaton.dm

Baton Fixes and Cattleprod Buff

2015-08-03 21:12:29 -04:00

surgery_limbattachment.dm

…

swords_axes_etc.dm

The Great Del() Cull of 2015

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

syndie_uplink.dm

Cleanup /defines/ folder.

2015-05-09 16:06:59 -07:00

syndie.dm

…

table_rack_parts.dm

The Great Del() Cull of 2015

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

tape.dm

BAYPORT: Duct Tape

2015-05-17 14:11:25 -07:00

teleportation.dm

…

tools.dm

isNonCrewAntag() checks, key_name fixes

2015-08-20 17:25:55 +02:00

twohanded.dm

The Great Del() Cull of 2015

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

vending_items.dm

Sushi Update

2015-08-23 00:22:31 -04:00

weaponry.dm

Consolidate ?/FLW links under key_name_admin

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

wires.dm

Cleanup /defines/ folder.

2015-05-09 16:06:59 -07:00