MrSnapwalk 07441e1e61 Attempting to fix conflicts with the following files: ...

icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi

2014-11-19 13:54:28 -06:00

..

48x48

…

atmos

Scrubber Icons

2014-11-14 18:48:56 +01:00

effects

Bunch of xeno fixes, details in PR.

2014-10-13 17:32:13 +10:30

mecha

Merge repair

2014-10-03 16:04:31 -04:00

misc

Revert "derp"

2014-02-21 18:17:15 +11:00

mob

Attempting to fix conflicts with the following files:

2014-11-19 13:54:28 -06:00

NTOS

Adds battery status icon to NTOS

2014-07-20 15:15:29 +02:00

obj

Attempting to fix conflicts with the following files:

2014-11-19 13:54:28 -06:00

pda_icons

…

PSD files

…

spideros_icons

…

Testing

Revert "derp"

2014-02-21 18:17:15 +11:00

turf

Merge remote-tracking branch 'upstream/dev' into PAP

2014-11-14 13:33:59 +01:00

vending_icons

…

480x480.dmi

…

am_engine.dmi

…

ashtray.dmi

…

dispensebutton_bg.png

…

minimap.dmi

…

policetape.dmi

Tape now does not stop anything like magical wall it used to be.

2014-08-29 00:50:33 +04:00

reagentname_bg.png

…

ss13_32.png

…

ss13_64.png

…

VendingMachineBG.png

…