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

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution

2014-12-16 02:52:08 +03:00

..

grenades

Made clumsiness into disability

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

implants

Merge pull request #6130 from phil235/AttackMsgStandardizedFormat

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

melee

Made clumsiness into disability

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

storage

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

2014-12-16 02:52:08 +03:00

tanks

Fixes toggling watertank nozzle in hands with verb

2014-12-03 18:58:08 +00:00

AI_modules.dm

Fixes the new AI lawcap config option

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

airlock_painter.dm

Hopefully final pass of object -> mob examine switch

2014-08-20 07:07:30 -07:00

cards_ids.dm

makes APC call parent

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

cigs_lighters.dm

removes zippo changes

2014-10-15 16:32:51 -07: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

Fix being able to apply lipstick through masks and items covering the mouth.

2014-11-01 13:28:32 +01:00

defib.dm

Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor

2014-12-09 16:03:45 -08:00

dice.dm

Makes dice use overlays

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

dna_injector.dm

Added datum mutations

2014-12-12 04:48:11 +03:00

explosives.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

extinguisher.dm

Conflicts:

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

flamethrower.dm

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

2014-03-21 03:05:39 -07:00

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

oops

2014-10-08 13:52:21 -07:00

kitchen.dm

Made clumsiness into disability

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

manuals.dm

Spacemen can now skim.

2014-10-05 09:51:08 -03:00

mop.dm

Conflicts:

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

paint.dm

Refactored the code to remove most icon operations for changing an icon's colour. I had to manually set all the icons, which are subject to colour change, to be have a white/grey icon, so that the colours added properly, and then have them coloured in the code. This means the icons for runes, the reagent beaker overlay, smoke and etc will all be white. They now all use the new 500+ color variable.

2014-01-15 21:30:55 +00:00

paiwire.dm

pAIs added. Two on station (Crew Quarters, R&D Director's Office) and one on the Derelict.

2011-05-30 19:33:28 +00:00

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

RSF.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

scrolls.dm

Fixes wizard slipping on all the area soaps

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

shields.dm

Made clumsiness into disability

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

singularityhammer.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

stunbaton.dm

Made clumsiness into disability

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

table_rack_parts.dm

Conflicts:

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

teleportation.dm

Fixing issue where people can't hear their own emotes while inside lockers and the audible messages when also in the dark. Removing object_talk() proc (obsolete).

2014-09-14 16:17:16 +02:00

tools.dm

Made clumsiness into disability

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

twohanded.dm

Made clumsiness into disability

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

vending_items.dm

Adds new undershirts, jeans and pants by WalterJe

2014-11-23 13:58:32 -03:00

weaponry.dm

Fixes up some silly problems with cursed items:

2014-09-15 19:22:25 -04:00