Lzimann d40760ad71 Fix conflicts

2017-04-07 09:12:36 -03:00

..

grenades

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

implants

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

melee

Fixes the energy cutlass. (#25636)

2017-03-31 09:37:15 -03:00

storage

Fix conflicts

2017-04-07 09:12:36 -03:00

tanks

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

AI_modules.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

airlock_painter.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

cards_ids.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

chrono_eraser.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

cigs_lighters.dm

Update cigs_lighters.dm

2017-03-17 12:08:48 -05:00

clown_items.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

cosmetics.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

courtroom.dm

…

defib.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

dice.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

dna_injector.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

explosives.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

extinguisher.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

flamethrower.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

gift.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

handcuffs.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

his_grace.dm

Removes His Grace ascension (#24909)

2017-03-10 22:36:02 -05:00

holosign_creator.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

holy_weapons.dm

Fixes chaplains not being able to assign their deity/religion plus some minor refactor of the religion subsystem

2017-04-06 23:44:13 -03:00

kitchen.dm

…

manuals.dm

…

miscellaneous.dm

…

mop.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

paint.dm

fixes paint and paint remover descs (#24417)

2017-02-25 17:49:13 -06:00

paiwire.dm

…

pneumaticCannon.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

powerfist.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

RCD.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

RPD.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

RSF.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

scrolls.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

sharpener.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

shields.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

signs.dm

…

singularityhammer.dm

…

stunbaton.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

teleportation.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

teleprod.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

tools.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

twohanded.dm

Red and green energy swords have much less saturated light colors (#25118)

2017-03-16 20:25:51 +13:00

vending_items.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

weaponry.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00