Razharas 10b21b20ab Conflicts resolution ...

In items weapons melee misc

2014-12-29 11:49:30 +03:00

..

grenades

Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit

2014-12-28 11:20:15 +03:00

implants

Merge pull request #6130 from phil235/AttackMsgStandardizedFormat

2014-12-04 12:45:31 -06:00

melee

Conflicts resolution

2014-12-29 11:49:30 +03:00

storage

Conflicts resolution

2014-12-29 11:49:30 +03:00

tanks

added message for toggling jetpack on and off

2014-12-24 16:10:44 -08:00

AI_modules.dm

Fixes the new AI lawcap config option

2014-12-02 18:27:06 -03:00

airlock_painter.dm

…

cards_ids.dm

makes APC call parent

2014-12-09 18:53:29 -08:00

cigs_lighters.dm

Little fix.

2014-12-18 18:00:17 +01:00

clown_items.dm

Fixes the mouth washing message and the cleaning message appearing at the same time.

2014-11-12 17:37:27 +01:00

cosmetics.dm

…

defib.dm

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00

dice.dm

Makes dice use overlays

2014-11-24 08:01:32 +11:00

dna_injector.dm

General cleanup

2014-12-29 11:36:01 +03:00

explosives.dm

Fix of c4 not deleting on signaler explosions

2014-12-16 00:47:09 +03:00

extinguisher.dm

Conflicts:

2014-11-13 17:33:32 +01:00

flamethrower.dm

…

gift_wrappaper.dm

Adds a santa event where a dead player is spawned as Santa! HO HO HO!

2014-12-08 17:03:52 +01:00

handcuffs.dm

Made clumsiness into disability

2014-12-14 08:04:48 +03:00

janisigns.dm

…

kitchen.dm

Fixed stuff tkdrg pointed out

2014-12-28 10:49:04 +03:00

manuals.dm

…

mop.dm

Conflicts:

2014-11-13 17:33:32 +01:00

paint.dm

…

paiwire.dm

…

power_cells.dm

Finished the exofab revamp:

2014-12-02 23:00:22 +01:00

RCD.dm

Adds changelog and nerfs door deconstruction.

2014-12-07 11:46:59 +00:00

RPD.dm

RPD tweaks

2014-12-26 20:50:34 -03:00

RSF.dm

…

scrolls.dm

Fixes wizard slipping on all the area soaps

2014-11-22 19:24:57 -03:00

shields.dm

Conflict fix

2014-12-21 06:12:33 +03:00

singularityhammer.dm

…

stunbaton.dm

Conflict fix

2014-12-21 06:12:33 +03:00

table_rack_parts.dm

Conflicts:

2014-11-13 17:33:32 +01:00

teleportation.dm

Prevent using the hand teleporter from inside closets and when under the influence of a chameleon projector.

2014-12-15 00:08:03 +01:00

tools.dm

Conflict fix

2014-12-21 06:12:33 +03:00

twohanded.dm

General cleanup

2014-12-29 11:36:01 +03:00

vending_items.dm

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

2014-12-22 16:19:43 -03:00

weaponry.dm

…