Datraen 349251e55f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3 ...

# Conflicts:
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/obj/weapons.dmi

2016-05-25 15:09:23 -04:00

..

admin

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

2016-05-25 15:09:23 -04:00

alarm

Camera fixes and performance tweaks.

2016-03-21 17:30:52 -04:00

assembly

Reverts the second mob clean up because of incomplete implementation.

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

awaymissions

…

blob

…

client

Adds towels

2016-05-25 18:38:16 +01:00

clothing

Makes suit sensors produce a message when changed and generalizes message

2016-05-25 19:42:26 +01:00

customitems

Ports Byond 510 preperations from Bay

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

detectivework

Fixes never being able to light molotovs and makes throwing them less crap

2016-05-21 15:10:49 +01:00

economy

Fixes #1136

2016-05-19 22:25:40 +01:00

events

Generic Station & System Name

2016-05-16 15:34:03 -04:00

examine

Generic Station & System Name

2016-05-16 15:34:03 -04:00

ext_scripts

…

flufftext

Changes some fluffy bits to be more accurate

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

food

…

games

Generic Station & System Name

2016-05-16 15:34:03 -04:00

genetics

…

ghosttrap

Changes types of ghosts and eyes

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

holodeck

Reverts the second mob clean up because of incomplete implementation.

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

hydroponics

Semi-final stage of Xenobio2 Initial Implementation

2016-05-25 03:50:23 -04:00

icon generation

…

library

Construction Update

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

lighting

…

maps

Fixes issues travis found

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

materials

Reinforced Walls

2016-04-15 16:41:33 +02:00

mining

Fixes #1527

2016-05-19 22:51:58 +01:00

mob

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

2016-05-25 15:09:23 -04:00

multiz

…

nano

HTML5 and CSS3 (#1677)

2016-05-19 14:28:38 -04:00

organs

Makes robolimbs repair completely

2016-05-18 01:25:34 -04:00

overmap

…

paperwork

Reverts the second mob clean up because of incomplete implementation.

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

power

Adjusts and adds more colors of cables

2016-05-19 18:13:12 +01:00

projectiles

Fixes #1655

2016-05-24 12:12:26 -04:00

random_map

Merge pull request #1027 from Kelenius/mobCleanup

2016-03-18 13:50:47 -04:00

reagents

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

2016-05-25 15:09:23 -04:00

recycling

Buildables v1.2 (#1517)

2016-05-03 22:18:12 +01:00

research

Buildables v1.2 (#1517)

2016-05-03 22:18:12 +01: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

…

shuttles

Removed the Vox Pox.

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

spells

Removes Horsehead and Mindswap from Wizard spellbooks

2016-05-22 11:38:09 -05:00

supermatter

Reverts the second mob clean up because of incomplete implementation.

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

surgery

Fixes beating people up during surgery

2016-05-18 22:59:05 +01:00

tables

…

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

Adds component requirements, adds tech levels, fixes copy error.

2016-05-25 14:40:55 -04:00

xgm

Revert "Revert "Bay update.""

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