Kelshark 641246155c Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi

2017-06-01 17:25:39 -04:00

..

admin

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-06-01 17:25:39 -04:00

alarm

Fixes Runtime in atmosphere_alarm.dm,24: list index out of bounds

2017-05-23 01:14:55 -04:00

assembly

…

awaymissions

Converted VOREStation custom guns and ammo to handle the swap of 5.56 and 7.62 ammo.

2017-05-26 17:54:04 -04:00

blob

…

busy_space

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26

2017-05-26 15:29:46 -04:00

client

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-06-01 17:25:39 -04:00

clothing

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-06-01 17:25:39 -04:00

customitems

…

detectivework

…

economy

Adds in an Unathi-made jerky snack

2017-04-07 23:36:22 -05:00

error_handler

…

events

Adjusts random events to be more suitable for the Tether

2017-05-24 17:08:39 -04:00

examine

Actually gets the HI name right

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

ext_scripts

…

flufftext

…

food

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

2017-04-01 19:19:42 -04:00

gamemaster

…

games

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

2017-05-08 21:07:45 -04:00

genetics

Adds Modifier System, Changes Some Ling Stuff

2017-04-18 21:23:59 -04:00

ghosttrap

…

holodeck

Holodeck menu tweak

2017-05-17 20:43:03 -04:00

holomap

Switch Tether over to use the map_z_level datum.

2017-05-26 18:57:07 -04:00

hydroponics

Merge branch 'master' into aro-tether-wip

2017-05-16 00:26:32 -04:00

icon generation

…

integrated_electronics

Fixes Logic Circuits

2017-05-06 16:35:06 -04:00

interserver shipping

…

library

…

lighting

Prevent lighting_overlay objects from being moved around.

2017-05-15 17:16:40 -04:00

lore_codex

Merge pull request #1430 from VOREStation/aro-announcer

2017-04-25 19:08:43 -04:00

maps

…

materials

Merge current master in

2017-04-25 20:14:38 -04:00

media

Convert to using Mediamanager lobby music

2017-05-08 02:33:46 -04:00

metric

…

mining

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-04-29 10:13:45 -04:00

mob

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-06-01 17:25:39 -04:00

multiz

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-05-24 13:46:58 -04:00

nano

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26

2017-05-26 15:29:46 -04:00

organs

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-06-01 17:25:39 -04:00

overmap

…

paperwork

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

2017-05-08 21:07:45 -04:00

planet

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

2017-04-25 15:04:54 -04:00

power

Enhances power monitor computers to use the nano-map to show APC locations.

2017-05-22 16:15:47 -04:00

projectiles

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-06-01 17:25:39 -04:00

random_map

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26

2017-05-26 15:29:46 -04:00

reagents

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-06-01 17:25:39 -04:00

recycling

…

research

Adds the Algae Oxygen Generator

2017-05-03 01:54:55 -04:00

resleeving

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-06-01 17:25:39 -04:00

rogueminer_vr

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-04-13 19:43:56 -04:00

scripting

…

security levels

…

shieldgen

Adds Modifier System, Changes Some Ling Stuff

2017-04-18 21:23:59 -04:00

shuttles

Tether Shuttle Crashing

2017-05-17 01:12:03 -04:00

spells

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

2017-05-08 21:07:45 -04:00

supermatter

Revert back "Tweaks hallucinations from the supermatter"

2017-05-26 16:21:31 -04:00

surgery

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

2017-04-01 19:19:42 -04:00

tables

Table Iconstate Cache

2017-05-15 22:38:53 -04:00

telesci

Converts our own uses of PoolOrNew to use just new()

2017-05-08 21:24:47 -04:00

turbolift

Adds "firefighter mode" to turbolifts

2017-05-26 14:45:00 -04:00

vehicles

Fixed securitrain typo

2017-05-17 12:39:01 -04:00

ventcrawl

Splits item check back into mob-specific procs.

2017-04-19 10:10:56 -07:00

virus2

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

2017-04-25 15:04:54 -04:00

vore

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-06-01 17:25:39 -04:00

xenoarcheaology

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

2017-05-08 21:07:45 -04:00

xenobio2

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

2017-05-08 21:07:45 -04:00

xgm

…