Arokha Sieyes c57e6e75b7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-smallsync ...

# Conflicts:
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm

Line ending changes?

2017-04-02 23:25:59 -04:00

..

admin

Fixes typo for dune buggy in code and adds fluff boxes to the quick create menu.

2017-03-27 01:58:49 -07:00

alarm

Make AR glasses show messages like HUDs

2017-03-28 16:09:14 -04:00

assembly

…

awaymissions

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

blob

…

busy_space

One more busy_space change

2017-03-18 01:16:45 -04:00

client

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

clothing

Fixes on-mob sprites

2017-04-02 17:49:37 -04:00

customitems

…

detectivework

…

economy

Fixes sliceable food and slices

2017-03-10 19:49:15 +00:00

error_handler

…

events

Disables Ian storms

2017-03-26 23:45:56 -04: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 polaris-sync

2017-04-01 19:19:42 -04:00

gamemaster

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

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

games

Adds 500 Cards against The Galaxy cards

2017-03-29 12:52:20 -04:00

genetics

…

ghosttrap

…

holodeck

…

hydroponics

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

icon generation

…

integrated_electronics

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

library

…

lighting

…

maps

…

materials

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

media

Oops. Accidently did mediamanager shutdown wrong. Fixed.

2017-03-28 19:36:56 -04:00

metric

…

mining

…

mob

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-smallsync

2017-04-02 23:25:59 -04:00

multiz

…

nano

Merge pull request #1187 from VOREStation/apc-map

2017-03-15 22:55:10 -04:00

organs

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

overmap

…

paperwork

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

planet

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

power

Make cells show correct icon when they spawn

2017-04-02 19:21:45 -04:00

projectiles

Adds the 'Hunter' Capture Gun

2017-04-02 19:25:27 -04:00

random_map

…

reagents

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-smallsync

2017-04-02 23:25:59 -04:00

recycling

…

research

Adds the 'Hunter' Capture Gun

2017-04-02 19:25:27 -04:00

resleeving

Fixes species with very low health in growpod

2017-03-13 11:47:14 -04:00

rogueminer_vr

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

scripting

…

security levels

Makes red alert and evacs silence the atc

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

shieldgen

…

shuttles

Bugfix, cleanup, & xenoarch belter access

2017-03-28 18:01:02 -04:00

spells

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

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 polaris-sync

2017-04-01 19:19:42 -04:00

tables

Adds bench presets

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

telesci

…

turbolift

…

vehicles

adds vehicles to the cargo lists and makes changes to a few things.

2017-03-26 22:39:54 -07:00

ventcrawl

Fixes ventcrawl

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

virus2

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

vore

Change my flash pistol to Hunter

2017-04-02 19:26:39 -04:00

xenoarcheaology

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

xenobio2

…

xgm

Fix rooms holding pressure when exposed to space.

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