Yoshax efe66153ab Merge branch 'master' of https://github.com/PolarisSS13/Polaris into dnalockframework ...

# Conflicts:
#	code/modules/projectiles/gun.dm

2016-06-01 00:47:52 +01:00

..

admin

First commit of manual port of BS12

2016-05-29 00:56:11 +01: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 a few more accessories

2016-05-31 06:16:05 -04:00

clothing

Adds a few more accessories

2016-05-31 06:16:05 -04:00

customitems

Ports Byond 510 preperations from Bay

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

detectivework

Adjusts molotovs to be able to use alcohol to set the rag alight

2016-05-27 15:39:35 +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

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

…

games

Generic Station & System Name

2016-05-16 15:34:03 -04: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

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

2016-05-28 20:22:09 +01:00

hydroponics

Randomized Plant Update (#1805)

2016-05-31 15:08:42 +01:00

icon generation

…

library

Fixes missing cooldowns, missing cult blade sound.

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

lighting

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-09-18 08:51:10 +02:00

maps

Fixes issues travis found

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

materials

Small update to double beds. (#1828)

2016-05-31 15:08:57 +01:00

mining

Fixes #1527

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

mob

Fixes overlay issue with ghosts when choosing sprites, and adds more sprites to choose from from popular demand.

2016-05-31 14:30:17 -07:00

multiz

Tweaks to previous commits.

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

nano

HTML5 and CSS3 (#1677)

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

organs

Merge pull request #1806 from VOREStation/limbprinter

2016-05-31 15:50:32 -04:00

overmap

More computer overlay changes.

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

paperwork

Reverts the second mob clean up because of incomplete implementation.

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

power

Ports Bay's Robolimb Changes (#1779)

2016-05-28 14:12:19 +01:00

projectiles

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

2016-06-01 00:47:52 +01:00

random_map

Merge pull request #1027 from Kelenius/mobCleanup

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

reagents

Merge pull request #1788 from Datraen/Xenobio2_Tweaks

2016-05-29 03:56:39 +01:00

recycling

Buildables v1.2 (#1517)

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

research

Sad that I have to do this.

2016-05-30 02:36:58 -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

…

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

Make FBPs Constructable

2016-05-30 02:13:55 -04: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

Xenobio2 Update #3 (#1832)

2016-05-31 18:30:52 +01:00

xgm

…