EmperorJon 741706e9e3 Underwear + setup merges (#1812) ...

* Manually merges 12595 and 12461.

* Moron Jon 2: Moron Boogaloo

* Makes Yosh happier

2016-05-30 19:19:45 +01:00

..

admin

First commit of manual port of BS12

2016-05-29 00:56:11 +01:00

alarm

…

assembly

Reverts the second mob clean up because of incomplete implementation.

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

awaymissions

…

blob

…

client

Underwear + setup merges (#1812)

2016-05-30 19:19:45 +01:00

clothing

Ports Models for Cybernetic Limb Manufacturers + More Monitor-head Wallpapers (#1775)

2016-05-29 15:09:56 +01:00

customitems

…

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

…

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

…

holodeck

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

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

hydroponics

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

2016-05-29 01:00:50 +01:00

icon generation

…

library

Fixes missing cooldowns, missing cult blade sound.

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

lighting

…

maps

…

materials

Reinforced Walls

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

mining

Fixes #1527

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

mob

Underwear + setup merges (#1812)

2016-05-30 19:19:45 +01:00

multiz

…

nano

HTML5 and CSS3 (#1677)

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

organs

Merges new for MMI/Posibrains, fixes runtimes from posibrains.

2016-05-29 17:57:16 -04:00

overmap

…

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 pull request #1787 from EmperorJon/28_May_Port_setup_changes

2016-05-28 22:59:56 -04:00

random_map

…

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

Fix copy/paste error duplicating definition

2016-05-25 23:12:56 -04:00

scripting

…

security levels

…

shieldgen

…

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

The Terminator Update

2016-05-29 02:37:13 -04:00

tables

…

vehicles

Reverts the second mob clean up because of incomplete implementation.

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

virus2

…

xenobio2

Merge pull request #1788 from Datraen/Xenobio2_Tweaks

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

xgm

…