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

Conflicts:
	code/game/objects/items/devices/telecrystal.dm
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi

2016-07-22 23:39:19 -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

Reverts the second mob clean up because of incomplete implementation.

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

awaymissions

…

blob

Mulebots are now mobs

2016-02-02 17:51:50 +03:00

client

Fixes Flannels. Also adds a Brown Flannel

2016-07-22 16:09:51 -04:00

clothing

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

2016-07-22 23:39:19 -04:00

customitems

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

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

Fixes grammar error

2016-07-16 21:29:02 -05:00

examine

AI Core Update

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

ext_scripts

Makes changes to allow IRC bot output at Sparky's request.

2015-12-11 19:58:05 +00:00

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

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

ghosttrap

Changes types of ghosts and eyes

2016-02-20 15:36:05 +03:00

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

Fixes missing cooldowns, missing cult blade sound.

2016-04-22 04:58:25 -04:00

lighting

Scheduler now uses btime, and other improvements

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

maps

Fixes issues travis found

2016-03-11 11:59:51 +03:00

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-22 23:39:19 -04:00

multiz

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

nano

Ports event system from Bay

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

organs

Merge pull request #2131 from Anewbe/meatier_limbs

2016-07-15 07:04:59 -04:00

overmap

More computer overlay changes.

2015-08-20 08:38:43 +02:00

paperwork

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

2016-07-22 23:39:19 -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-19 17:37:14 -04:00

random_map

Ensure laser warfare drop pod has laser proof armor

2016-07-13 20:10:44 +01:00

reagents

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

2016-07-22 23:39:19 -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

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

security levels

Construction Update

2016-03-25 16:02:36 -04:00

shieldgen

Updates blob

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

shuttles

Removed the Vox Pox.

2016-02-20 11:24:19 +10:30

spells

510 Improved Overlays

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

supermatter

Reverts the second mob clean up because of incomplete implementation.

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

surgery

Makes FBP burn repair actually work

2016-07-22 03:57:29 +01:00

tables

makes benches a subtype of tables

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

vehicles

Reverts the second mob clean up because of incomplete implementation.

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

virus2

Fixes #1171

2016-03-21 14:22:44 +03:00

xenobio2

Some more work + prep for drydocking.

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

xgm

Revert "Revert "Bay update.""

2016-02-07 16:33:30 +10:30