Tigercat2000 0996890e44 Merge remote-tracking branch 'upstream/master' into fluffclean ...

Conflicts:
	paradise.dme

2015-05-16 05:38:40 -07:00

..

grenades

Add check for antags in msg_admin_attack

2015-04-12 08:41:53 -07:00

implants

Add check for antags in msg_admin_attack

2015-04-12 08:41:53 -07:00

melee

…

storage

Couple of superhero fixes

2015-05-12 08:10:04 -04:00

tanks

Fixes and Tweaks

2015-05-15 21:58:24 -04:00

AI_modules.dm

Revert "R&D Research Levels Unification"

2015-04-07 01:16:19 -04:00

alien_specific.dm

…

cards_ids.dm

Fluff item removal: Compile fix

2015-05-13 05:29:05 -07:00

cash.dm

…

caution.dm

Cleanup /defines/ folder.

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

chrono_eraser.dm

Generic Action\Action Button System

2015-05-11 09:32:08 -07:00

cigs_lighters.dm

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

2015-05-16 05:38:40 -07:00

clown_items.dm

Merge pull request #1061 from FalseIncarnate/wizard

2015-05-16 07:34:22 -04:00

cosmetics.dm

Adds spraycans, fixes lipstick, modifies scleaner

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

courtroom.dm

…

defib.dm

FIX: Attack logs being backwards

2015-05-16 04:41:37 -07:00

dice.dm

Obtainable dice and D&D figures

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

disks.dm

Cleanup /defines/ folder.

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

dna_injector.dm

…

dnascrambler.dm

…

explosives.dm

FIX: Attack logs being backwards

2015-05-16 04:41:37 -07:00

extinguisher.dm

Reintegrate mob fire

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

fireworks.dm

…

flamethrower.dm

Fixes and Tweaks

2015-05-15 21:58:24 -04:00

game_kit.dm

…

gift_wrappaper.dm

…

grenades.dm

[Goonchem] Cryox/Clonex Change

2015-05-08 18:32:00 -04:00

handcuffs.dm

FIX: Attack logs being backwards

2015-05-16 04:41:37 -07:00

holosign.dm

Cleanup /defines/ folder.

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

hydroponics.dm

Botany / Xenobotany Update

2015-05-09 06:00:24 -04:00

kitchen.dm

…

legcuffs.dm

Cleanup /defines/ folder.

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

lighters.dm

Fluff item restoration - Flasks, Lighters

2015-05-16 05:36:56 -07:00

manuals.dm

Revert "Change space law iframe wiki link"

2015-03-27 23:53:52 +01:00

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

Revert "R&D Research Levels Unification"

2015-04-07 01:16:19 -04:00

paint.dm

…

paiwire.dm

…

power_cells.dm

Revert "R&D Research Levels Unification"

2015-04-07 01:16:19 -04:00

RCD.dm

Makes RCD qdel doors

2015-04-29 20:26:59 -07:00

RSF.dm

…

scrolls.dm

…

shards.dm

Squish Squash

2015-04-04 14:27:53 -04:00

shields.dm

Revert "R&D Research Levels Unification"

2015-04-07 01:16:19 -04:00

signs.dm

Fix exploit to get around delay, change to notice instead of warning

2015-04-07 02:26:25 +02:00

sm_shard.dm

Adds two new event species

2015-05-14 22:30:38 -04:00

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

Cleanup /defines/ folder.

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

stunbaton.dm

Don't kill me please

2015-04-08 18:41:35 -04:00

surgery_limbattachment.dm

…

swords_axes_etc.dm

…

syndie_uplink.dm

Cleanup /defines/ folder.

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

syndie.dm

…

table_rack_parts.dm

Cleanup /defines/ folder.

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

teleportation.dm

Squish Squash

2015-04-04 14:27:53 -04:00

tools.dm

Snowflake fun removal

2015-05-15 15:36:39 -04:00

twohanded.dm

LINDA, Stage 1

2015-04-28 08:43:42 -07:00

vending_items.dm

…

weaponry.dm

Add check for antags in msg_admin_attack

2015-04-12 08:41:53 -07:00

wires.dm

Cleanup /defines/ folder.

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