Tigercat2000 bcb4a9601f Merge remote-tracking branch 'upstream/master' into poolit ...

Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm

2015-06-22 13:40:07 -07:00

..

grenades

Explosion Rework

2015-06-20 04:13:55 -04:00

implants

Add check for antags in msg_admin_attack

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

melee

Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits

2015-02-22 08:27:38 -05:00

storage

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

tanks

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

2015-06-22 13:40:07 -07:00

AI_modules.dm

Redoes the Ion Storm Event and Toy AI

2015-06-04 00:06:16 -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

Re-Works Maintenance Loot

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

chrono_eraser.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

cigs.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

clown_items.dm

Stun+Weaken Balancing

2015-05-31 06:35:14 -04:00

cosmetics.dm

Adds spraycans, fixes lipstick, modifies scleaner

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

courtroom.dm

Adding gavel and block

2015-03-25 10:22:04 -04:00

defib.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -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

Small object manipulation stuff

2015-05-26 14:00:20 -04:00

dnascrambler.dm

…

explosives.dm

Fixes C4 del'ing instead of qdel'ing

2015-05-25 05:10:23 -04:00

extinguisher.dm

Reintegrate mob fire

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

fireworks.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

flamethrower.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

game_kit.dm

…

gift_wrappaper.dm

tweaks and optimization

2015-06-21 02:16:18 -04:00

grenades.dm

Singularity Refactor

2015-06-10 20:04:28 -04:00

handcuffs.dm

Small object manipulation stuff

2015-05-26 14:00:20 -04: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

Kitchen Overhaul

2015-03-08 05:09:19 -04:00

legcuffs.dm

Cleanup /defines/ folder.

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

lighters.dm

Fixes match attack proc and processing

2015-05-22 08:43:57 -04: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

RCD Fix

2015-05-22 16:55:41 -04:00

RSF.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

scrolls.dm

…

shards.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07: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

Fixes supermatter "glass" shards having bad icons

2015-05-25 09:02:36 -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

Merge pull request #1283 from Fox-McCloud/Throw-BYOND-Instead

2015-06-10 21:19:46 -04:00

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

tape.dm

BAYPORT: Duct Tape

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

teleportation.dm

Squish Squash

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

tools.dm

Fixes eyeless people runtiming when welding

2015-06-15 09:42:36 -04:00

twohanded.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

vending_items.dm

Aquariums and Pet Rocks!

2015-06-12 04:14:28 -04:00

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