Arokha Sieyes 4902e94c0b Merge pull request #1145 from JoanRisu/Fluff_Items_worshop ...

Conflict Resolver: Revenge of the Merge

2017-03-10 09:49:31 -05:00

..

admin

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

2017-03-06 22:46:28 -05:00

alarm

…

assembly

…

awaymissions

Updated our custom items and maps to account for the path changes for boots!

2017-03-06 21:46:35 -05:00

blob

…

busy_space

Space Chatter

2017-03-01 15:32:43 -05:00

client

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

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

clothing

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

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

customitems

Adds a check for custom items

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

detectivework

…

economy

…

error_handler

…

events

Merge pull request #1150 from VOREStation/vplk-atmos-leak

2017-03-09 23:27:19 -05:00

examine

…

ext_scripts

…

flufftext

…

food

…

gamemaster

New Event: Canister Leak

2017-03-09 19:59:32 -05:00

games

Merge large polaris changes

2017-03-02 22:44:17 -05:00

genetics

…

ghosttrap

…

holodeck

…

hydroponics

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

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

icon generation

…

integrated_electronics

Resleeving tweaks, fix compile warning

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

library

…

lighting

…

maps

…

materials

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

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

metric

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

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

mining

…

mob

REALLY right-side talk icons

2017-03-08 19:59:29 -05:00

multiz

Adds Multi-Z Test Map

2017-03-03 09:40:34 -05:00

nano

Adds a console to medical, engineering, security AR glasses

2017-03-06 00:33:08 -05:00

organs

Adds Serdy's Robobutt

2017-03-04 17:25:17 -05:00

overmap

…

paperwork

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

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

planet

Comment out noisy message

2017-03-03 00:43:35 -05:00

power

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

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

projectiles

Merge large polaris changes

2017-03-02 22:44:17 -05:00

random_map

…

reagents

Merge pull request #1089 from Yoshax/ewwwfatpeople

2017-03-04 18:35:07 -05:00

recycling

…

research

Merge pull request #1152 from VOREStation/aro-implanter

2017-03-09 23:26:54 -05:00

resleeving

Replace backup implant boxes with special implanter

2017-03-09 23:13:52 -05:00

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

…

shuttles

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

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

spells

Merge large polaris changes

2017-03-02 22:44:17 -05:00

supermatter

…

surgery

…

tables

…

telesci

Initial commit of new map system for Virgo

2017-03-02 23:34:43 -05:00

turbolift

Ports Turbolifts from Bay.

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

vehicles

Some personal changes to my items and adds a dune buggy for science expeditions.

2017-03-02 23:17:04 -08:00

ventcrawl

…

virus2

Now in disease form

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

vore

Merge pull request #1145 from JoanRisu/Fluff_Items_worshop

2017-03-10 09:49:31 -05:00

xenoarcheaology

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

2017-03-03 19:39:56 -05:00

xenobio2

Merge large polaris changes

2017-03-02 22:44:17 -05:00

xgm

…