SinTwo 976847a0b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state ...

Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi

2016-07-13 17:07:52 -04:00

..

devices

item_state cleanup

2016-07-11 22:31:32 -04:00

robot

Make FBPs Constructable

2016-05-30 02:13:55 -04:00

stacks

Adds fifty stacks for all material stacks and makes drop pod actually drop fifties

2016-07-10 03:40:24 +01:00

weapons

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state

2016-07-13 17:07:52 -04:00

apc_frame.dm

…

blueprints.dm

…

bodybag.dm

Freezer Fixes

2016-07-10 03:00:25 -04:00

contraband.dm

…

crayons.dm

…

glassjar.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

latexballoon.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

paintkit.dm

…

shooting_range.dm

…

toys.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

trash.dm

Adds a new vending machine that vends fitness related products

2016-05-20 22:04:00 +01:00