Anewbe e9c4b5a3eb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things ...

# Conflicts:
#	icons/mob/back.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi

2017-04-07 16:11:50 -05:00

..

admin

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

2017-04-07 16:11:50 -05:00

alarm

…

assembly

…

awaymissions

…

blob

…

busy_space

Makes red alert and evacs silence the atc

2017-03-13 07:41:10 -04:00

client

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

2017-04-07 16:11:50 -05:00

clothing

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

2017-04-07 16:11:50 -05:00

customitems

…

detectivework

…

economy

…

error_handler

…

events

Not So Simple Animals (#3103)

2017-03-22 14:30:07 -05:00

examine

Actually gets the HI name right

2017-03-24 15:27:55 -05:00

ext_scripts

…

flufftext

…

food

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

2017-03-22 17:29:01 -05:00

gamemaster

Make sure that the canisters selected have a bit o' air in them.

2017-03-11 19:02:24 -05:00

games

…

genetics

…

ghosttrap

…

holodeck

…

hydroponics

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

2017-03-24 16:35:31 -05:00

icon generation

…

integrated_electronics

Adds hand sprites to many items in the engineering department

2017-03-29 04:09:33 +01:00

library

…

lighting

…

maps

…

materials

Wooden circlets can now be worn as hats

2017-04-01 15:31:06 -05:00

metric

…

mining

…

mob

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

2017-04-07 16:11:50 -05:00

multiz

…

nano

…

organs

Robolimbs last longer without negative effects

2017-04-02 19:35:31 -05:00

overmap

…

paperwork

Fix Runtimes

2017-03-30 21:20:31 -04:00

planet

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

2017-03-24 16:35:31 -05:00

power

Make cells show correct icon when they spawn

2017-04-02 19:28:11 -04:00

projectiles

Merge pull request #3226 from Yoshax/lemat

2017-04-05 13:32:16 -05:00

random_map

…

reagents

Makes Carthatoline actually creatable

2017-04-02 01:26:40 -04:00

recycling

…

research

Antag Radio changes

2017-03-25 14:19:57 -05:00

scripting

…

security levels

Makes red alert and evacs silence the atc

2017-03-13 07:41:10 -04:00

shieldgen

…

shuttles

Dynamic Shuttles - Code and Icon Changes

2017-03-25 21:00:08 -04:00

spells

…

supermatter

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

2017-03-22 17:29:01 -05:00

surgery

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

2017-03-22 17:29:01 -05:00

tables

Adds bench presets

2017-03-24 22:46:43 -05:00

turbolift

…

vehicles

…

ventcrawl

Fixes ventcrawl

2017-03-18 19:30:54 -04:00

virus2

…

xenoarcheaology

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

2017-04-01 12:45:45 -05:00

xenobio2

…

xgm

Fix rooms holding pressure when exposed to space.

2017-03-15 19:04:33 -04:00