killer653 153641cabe Fixes conflict ...

Fixes conflict

2017-07-25 08:58:36 -04:00

..

admin

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

2017-06-30 22:31:43 -04:00

alarm

…

assembly

…

awaymissions

Merge remote-tracking branch 'refs/remotes/origin/master' into guns

2017-07-02 00:30:23 -04:00

blob

…

busy_space

…

client

Fixes code up.

2017-07-13 17:12:46 -04:00

clothing

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

2017-06-30 22:31:43 -04:00

customitems

…

detectivework

…

economy

…

error_handler

…

events

…

examine

…

ext_scripts

Disable all shell() exec prox for extra security.

2017-07-20 22:24:27 -04:00

flufftext

…

food

…

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

…

holomap

…

hydroponics

…

icon generation

…

integrated_electronics

…

library

…

lighting

Converts the lighting process controller to a StonedMC subsystem

2017-06-16 23:08:41 -04:00

lore_codex

sleepy commit

2017-07-04 06:38:32 -04:00

maps

…

materials

…

media

…

metric

…

mining

…

mob

Fixes conflict

2017-07-25 08:58:36 -04:00

multiz

fixes the lattices too.

2017-07-18 19:46:57 +03:00

nano

…

nifsoft

Renames "second-hand NIF" to "bootleg NIF"

2017-07-18 01:58:32 -04:00

organs

irrelevant fluffstuff

2017-07-08 21:05:39 +03:00

overmap

…

paperwork

…

planet

…

power

…

projectiles

Final additions and fixes

2017-07-04 20:01:38 -04:00

random_map

…

reagents

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

2017-06-30 22:31:43 -04:00

recycling

…

research

Quick design datum fix

2017-07-23 14:53:47 -04:00

resleeving

…

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

…

supermatter

…

surgery

…

tables

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

2017-06-30 22:31:43 -04:00

telesci

…

turbolift

…

vehicles

…

ventcrawl

…

virus2

…

vore

Fixes conflict

2017-07-25 08:58:36 -04:00

xenoarcheaology

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

2017-06-30 22:31:43 -04:00

xenobio2

…

xgm

…