PsiOmega 7ab57a4917 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/weapons/storage/fancy.dm
	code/modules/mob/living/carbon/human/life.dm

2015-03-20 08:44:52 +01:00

..

48x48

…

atmos

HE pipe changes

2015-01-12 21:28:41 +00:00

effects

Beam effects cleanup

2015-03-15 17:46:15 +13:00

mecha

Merge repair

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

misc

…

mob

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

2015-03-20 08:44:52 +01:00

NTOS

…

obj

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

2015-03-20 08:44:52 +01:00

pda_icons

…

PSD files

…

spideros_icons

…

Testing

…

turf

Mapping changes preparation

2015-02-09 18:53:02 +01:00

vending_icons

…

480x480.dmi

…

am_engine.dmi

…

ashtray.dmi

…

chattags.dmi

Antag-OOC

2015-03-09 12:19:50 +03:00

covershield.dmi

Another pass at WIP folder

2015-02-03 12:14:13 +03:00

dispensebutton_bg.png

…

jungle.dmi

Removes jungle

2015-02-03 04:01:16 -07:00

meteor_turret.dmi

Another pass at WIP folder

2015-02-03 12:14:13 +03:00

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

…

rust_old.dmi

Another pass at WIP folder

2015-02-03 12:14:13 +03:00

rust.dmi

Another pass at WIP folder

2015-02-03 12:14:13 +03:00

ss13_32.png

…

ss13_64.png

…

VendingMachineBG.png

…