Arokha Sieyes 60d541037c Fix compile error from merge

2017-03-26 20:32:33 -04:00

..

admin

Merge pull request #3116 from VOREStation/spawn

2017-03-21 18:38:23 -05:00

alarm

…

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

Fix compile error from merge

2017-03-26 20:32:33 -04:00

clothing

Polaris Merge Sync

2017-03-26 20:12:34 -04:00

customitems

Adds a check for custom items

2017-03-06 21:25:54 -06:00

detectivework

…

economy

Fixes sliceable food and slices

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

error_handler

…

events

Tweak events to reduce frequency of Ian storms and such.

2017-03-25 00:07:56 -04:00

examine

Actually gets the HI name right

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

ext_scripts

…

flufftext

…

food

Merge pull request #3074 from VOREStation/recipes

2017-03-13 17:17:54 -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

Arokha SA Rework (Polaris)

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

icon generation

…

integrated_electronics

Resleeving tweaks, fix compile warning

2017-03-06 14:22:11 -05:00

library

…

lighting

…

maps

…

materials

Merge remote-tracking branch 'polaris/master'

2017-03-22 20:08:29 -04:00

media

Implements browser streaming media jukeboxes

2017-03-23 21:10:11 -04:00

metric

Fixed paths references to obsolete path /obj/item/clothing/shoes/combat

2017-03-06 21:58:39 -05:00

mining

…

mob

Polaris Merge Sync

2017-03-26 20:12:34 -04:00

multiz

…

nano

Merge pull request #1187 from VOREStation/apc-map

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

organs

Polaris Merge Sync

2017-03-26 20:12:34 -04:00

overmap

…

paperwork

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

2017-03-11 18:47:17 -05:00

planet

Merge remote-tracking branch 'polaris/master'

2017-03-22 20:08:29 -04:00

power

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

2017-03-21 11:22:29 -04:00

projectiles

Polaris Merge Sync

2017-03-26 20:12:34 -04:00

random_map

…

reagents

Polaris Merge Sync

2017-03-26 20:12:34 -04:00

recycling

…

research

Fix ported translator paths and map entries

2017-03-18 01:17:00 -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

Reworks empulse and emp_act

2017-03-05 12:22:45 -06:00

shuttles

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

2017-03-06 20:58:38 -05:00

spells

Added vore capabilies to the new simple_animal system.

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

supermatter

…

surgery

Allow MMI/Posi/Digi brains w/o minds to be put in

2017-03-12 01:15:40 -05:00

tables

Adds bench presets

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

telesci

…

turbolift

Ports Turbolifts from Bay.

2017-03-04 21:35:00 -05:00

vehicles

…

ventcrawl

Fixes ventcrawl

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

virus2

Now in disease form

2017-03-08 19:52:55 -05:00

vore

Merge pull request #1234 from VOREStation/polaris-sync-and-simple-animal

2017-03-24 01:03:20 -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