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

..

admin

Creates a prompt on unparalyze

2016-07-10 20:58:08 -05:00

alarm

Ports event system from Bay

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

assembly

…

awaymissions

…

blob

…

client

1.5.5 Fancy Green Uniforms

2016-07-12 17:19:39 -07:00

clothing

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

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

customitems

…

detectivework

item_state cleanup

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

economy

Adds new non-alcoholic drinks

2016-07-07 21:51:30 +01:00

events

Polaris fix

2016-07-10 04:15:32 +01:00

examine

AI Core Update

2016-07-05 17:33:34 -04:00

ext_scripts

…

flufftext

Changes some fluffy bits to be more accurate

2016-05-21 18:00:54 -05:00

food

adds bun-bun, a bread monkey made with two burger buns

2016-07-05 18:19:05 +01:00

games

Introduces max record length for record, converts uses of max book length to max paper length barring books

2016-06-27 16:26:31 +01:00

genetics

…

ghosttrap

…

holodeck

item_state cleanup

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

hydroponics

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

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

icon generation

…

library

…

lighting

Scheduler now uses btime, and other improvements

2016-06-01 17:56:07 +01:00

maps

…

materials

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

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

mining

Explosive Mining!

2016-07-10 08:06:56 -04:00

mob

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

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

multiz

…

nano

Ports event system from Bay

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

organs

Health Hud Prosthetics Fix

2016-07-13 14:46:21 -04:00

overmap

…

paperwork

item_state cleanup

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

power

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

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

projectiles

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

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

random_map

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

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

reagents

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

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

recycling

Frame Fixes

2016-06-01 14:32:56 -04:00

research

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

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

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

510 Improved Overlays

2016-06-18 15:50:10 -03:00

supermatter

…

surgery

Adds do_surgery() behaviour for various items

2016-06-17 19:06:56 +01:00

tables

makes benches a subtype of tables

2016-06-29 17:52:27 -04:00

vehicles

…

virus2

…

xenobio2

Some more work + prep for drydocking.

2016-07-08 20:38:34 -04:00

xgm

…