Neerti 3c92193bf5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance ...

# Conflicts resolved:
#	code/modules/projectiles/projectile/beams.dm

2016-04-20 05:41:36 -04:00

..

admin

Adds full atmospherics reset admin verb

2016-04-10 17:23:43 +01:00

alarm

Camera fixes and performance tweaks.

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

assembly

Construction Update

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

awaymissions

…

blob

…

client

Merge pull request #1447 from Yoshax/safetyfiring

2016-04-19 21:12:35 -04:00

clothing

Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port

2016-04-16 02:58:07 +01:00

customitems

Ports Byond 510 preperations from Bay

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

detectivework

Inventory Tweaks 1

2016-04-16 10:28:14 -04:00

economy

Changes the feed creator for the Vir Times to a Vir Times Exonet Node for the station, as opposed to "SolGov Minister for Information" which was a little outdated and incongruous.

2016-04-09 18:25:46 +01:00

events

Construction Update

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

examine

…

ext_scripts

…

flufftext

Ports Byond 510 preperations from Bay

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

food

…

games

Construction Update

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

genetics

…

ghosttrap

Changes types of ghosts and eyes

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

holodeck

…

hydroponics

Construction Update

2016-03-25 16:02:36 -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

Merge pull request #1229 from SinTwo/construction_update

2016-03-26 15:45:19 -04:00

mining

Construction Update

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

mob

Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port

2016-04-16 02:58:07 +01:00

multiz

…

nano

Updates NanoUI map.

2016-03-30 15:02:42 +01:00

organs

Adds verb to change eye color at will (if mechanical)

2016-04-16 06:14:09 -04:00

overmap

…

paperwork

Merge pull request #1229 from SinTwo/construction_update

2016-03-26 15:45:19 -04:00

power

Manually ports Bay's volume inventory system.

2016-04-06 03:31:21 -04:00

projectiles

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance

2016-04-20 05:41:36 -04:00

random_map

Merge pull request #1027 from Kelenius/mobCleanup

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

reagents

Merge pull request #1442 from Yoshax/drinksloadout

2016-04-18 16:33:42 +01:00

recycling

Construction Update

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

research

Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port

2016-04-16 02:58:07 +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

…

spells

Changes types of ghosts and eyes

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

supermatter

…

surgery

Construction Update

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

tables

…

vehicles

…

virus2

Fixes #1171

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

xgm

…