Mark9013100 fb1134a24b Changes several helmets, fixes shields ...

Conflicts:
	code/game/objects/items/devices/radio/headset.dm
	code/game/objects/items/weapons/shields.dm
	code/modules/clothing/head/helmet.dm
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi

2015-10-11 00:39:38 -04:00

..

effects

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

items

Changes several helmets, fixes shields

2015-10-11 00:39:38 -04:00

random

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

structures

TG_PORT_fix 2

2015-10-11 00:36:50 -04:00

buckling.dm

Fixes beds occasionally buckling in odd directions

2015-09-19 15:27:24 +02:00

empulse.dm

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

2015-08-11 08:21:06 +02:00

explosion_recursive.dm

Merge resolution.

2015-05-11 11:47:24 +09:30

explosion.dm

Multi-Z.

2015-08-30 14:15:20 -07:00

items.dm

Updates blob

2015-10-05 18:10:16 +03:00

objs.dm

Moves nanomanager.close_uis(src) into datum/proc/Destroy() instead of /obj/Destroy() now that NanoUI supports datums.

2015-09-08 08:32:09 +02:00

structures.dm

Updates blob

2015-10-05 18:10:16 +03:00

weapons.dm

…