Ikarrus e27cdc7efe Resolved Conflicts: ...

code/game/gamemodes/gang/dominator.dm

2015-06-18 23:05:51 -06:00

..

devices

Merge pull request #9960 from xxalpha/bass

2015-06-18 15:50:35 +02:00

robot

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

stacks

REMOVES CABLE CUFF

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

weapons

Resolved Conflicts:

2015-06-18 23:05:51 -06:00

apc_frame.dm

span classes removed from visible.messages

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

blueprints.dm

Removed unnecessary spaces in these situations:

2015-06-14 12:13:19 +03: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

- Ghosts can hear gang messages

2015-06-12 08:22:42 -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

Fixes three runtimes.

2015-06-11 21:30:13 +01:00

latexballoon.dm

Removed unnecessary spaces in these situations:

2015-06-14 12:13:19 +03:00

shooting_range.dm

Fixes range targets changing icons

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

toys.dm

Gang Update: Fashion War Edition

2015-06-18 20:01:57 -06:00

trash.dm

…