Lzimann 79d9178adf Fix conflicts

2017-04-25 10:51:49 -03:00

..

assembly.dm

Replaces the default output with the to_chat wrapper.

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

bomb.dm

Fix conflicts

2017-04-25 10:51:49 -03:00

doorcontrol.dm

Global variable wrappers (#25325)

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

flash.dm

Rename ticker to SSticker

2017-03-22 10:48:25 -04:00

health.dm

Fix conflicts

2017-04-25 10:51:49 -03:00

helpers.dm

Makes is_type helpers inline

2015-10-21 22:22:58 +02:00

holder.dm

Improves changeling power logging (#26079)

2017-04-12 21:11:10 +12:00

igniter.dm

Fixes some more goddamn typos and bad writing. (#24095)

2017-02-17 14:10:58 +13:00

infrared.dm

Bicon conversion

2017-04-24 22:12:01 -03:00

mousetrap.dm

Replaces the default output with the to_chat wrapper.

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

proximity.dm

Fix conflicts

2017-04-25 10:51:49 -03:00

shock_kit.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00

signaler.dm

Fix conflicts

2017-04-25 10:51:49 -03:00

timer.dm

Fix conflicts

2017-04-25 10:51:49 -03:00

voice.dm

Merges whisper verb into saycode, extends to all living mobs

2017-04-07 02:23:47 -04:00