Ikarrus d2ef043690 Resolved Conflicts: ...

code/modules/mob/living/living.dm

2015-06-11 23:46:59 -06:00

..

devices

Resolved Conflicts:

2015-06-11 23:46:59 -06:00

robot

Fixes the mining borg diamond drill upgrade

2015-05-06 10:09:57 -05:00

stacks

REMOVES CABLE CUFF

2015-06-06 16:21:41 -05:00

weapons

Merge pull request #9769 from Cheridan/ACTUAL_FUN_REMOVAL

2015-06-11 16:15:41 +01:00

apc_frame.dm

span classes removed from visible.messages

2015-04-24 20:50:51 +03:00

blueprints.dm

Removes strip_html_properly(), replaces it with html_encode().

2015-06-11 15:37:41 +02:00

body_egg.dm

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

bodybag.dm

pre-map compile

2015-04-08 15:40:41 +10:00

candle.dm

…

crayons.dm

Gang Update

2015-06-10 23:05:58 -06:00

dehy_carp.dm

Dehydrated carps inherit factions (minus neutral) from their owner.

2015-04-24 15:18:37 -05:00

documents.dm

…

holotape.dm

span classes removed from visible.messages

2015-04-24 20:50:51 +03:00

latexballoon.dm

…

shooting_range.dm

Fixes range targets changing icons

2015-05-14 03:30:32 -03:00

toys.dm

merge conflict fix

2015-05-31 02:45:46 +02:00

trash.dm

…