2346 Commits

Author	SHA1	Message	Date
Nadyr	4ce40dad53	Merge pull request #1625 from CHOMPStationBot/upstream-merge-9955 ... [MIRROR] [MIRROR] Added think-tanks.	2021-03-26 03:50:02 -04:00
Razgriz	3802d7049a	Merge pull request #1643 from CHOMPStationBot/upstream-merge-9983 ... [MIRROR] Fixes https://github.com/VOREStation/VOREStation/issues/9975	2021-03-22 01:15:20 -07:00
Novacat	98ef088fa6	Merge pull request #9986 from Meghan-Rossi/pilot_harness ... Pilots get their harness even with loadout uniform	2021-03-21 21:53:15 +00:00
Novacat	f367e7b3fc	Merge pull request #9983 from Meghan-Rossi/talon_manifest_fix ... Fixes https://github.com/VOREStation/VOREStation/issues/9975	2021-03-21 20:13:31 +00:00
Nadyr	c8321a53df	Merge pull request #1617 from CHOMPStationBot/upstream-merge-9960 ... [MIRROR] [MIRROR] Added Doctress' Jager drink.	2021-03-21 04:31:54 -04:00
Chompstation Bot	2a5c21c8f5	[MIRROR] Kaleidoscope 2: The Retabbening	2021-03-21 01:24:14 -04:00
Chompstation Bot	b7b8682e7c	[MIRROR] Added think-tanks.	2021-03-18 14:57:26 +00:00
Novacat	d2b2342d74	Merge pull request #9965 from VOREStation/upstream-merge-7983 ... [MIRROR] Fixes pilots not getting a harness if they use a loadout uniform	2021-03-18 14:40:40 +00:00
Novacat	f2fc4c8be7	Merge pull request #9960 from VOREStation/upstream-merge-7974 ... [MIRROR] Added Doctress' Jager drink.	2021-03-18 14:40:00 +00:00
Novacat	645c134eb3	Merge pull request #9906 from Little-119/weird-helmet-begone ... Remove weird helmet thing from Forensic Technician outfit	2021-03-11 22:21:31 +00:00
Nadyr	604b71d59b	Merge pull request #1539 from CHOMPStationBot/upstream-merge-9620 ... [MIRROR] [MIRROR] Industrial Expansion	2021-03-10 01:05:16 -05:00
Chompstation Bot	b85e9fc4d9	[MIRROR] Industrial Expansion	2021-03-09 21:53:03 +00:00
Chompstation Bot	598a7814e8	[MIRROR] Adds a modular armour version of the explorer suit and adds sprites to specialist armour	2021-03-09 20:17:06 +00:00
Chompstation Bot	247bcbcc24	Adds a bunch more boards to technical storage and AI law storage, makes appliance boards makeable in autolathe	2021-03-06 23:21:40 +00:00
Nadyr	3bd7e2b888	Merge pull request #1320 from CHOMPStationBot/upstream-merge-9704 ... [MIRROR] [MIRROR] Telecrystals are only stored on the mind	2021-03-06 01:31:07 -05:00
Nadyr	715ca3ef63	Update uplink_items.dm	2021-03-06 01:11:29 -05:00
Novacat	7f7c5873d6	Merge pull request #9814 from VOREStation/upstream-merge-7820 ... [MIRROR] Adds the Restraining Bolt.	2021-02-28 23:16:43 +00:00
Nadyr	0945ff1f1e	Merge pull request #1426 from CHOMPStationBot/upstream-merge-9801 ... [MIRROR] [MIRROR] Adds some tacticooler undershirts	2021-02-28 06:10:33 -05:00
Chompstation Bot	ad57e1ad13	[MIRROR] Sideports a couple of init unit tests from Neb.	2021-02-27 18:45:36 +00:00
Novacat	b07c6d9680	Merge pull request #9801 from VOREStation/upstream-merge-7924 ... [MIRROR] Adds some tacticooler undershirts	2021-02-26 15:20:27 +00:00
Cadyn	e10c15065a	Discord HTML Manifest	2021-02-23 12:03:02 -08:00
Cadyn	ae7b89500a	Fixing stuff	2021-02-22 18:17:37 -08:00
Chompstation Bot	24b712ec4d	[MIRROR] Telecrystals are only stored on the mind	2021-02-13 21:26:38 +00:00
Novacat	3f3e7c536f	Merge pull request #9691 from VOREStation/upstream-merge-7865 ... [MIRROR] Allows custom-selection of posters	2021-02-12 21:27:50 +00:00
Novacat	aae47359c3	Merge pull request #9654 from Novacat/nova-basicfixes ... Syndicate Cruiser Tweaks	2021-02-08 00:36:07 +00:00
Novacat	5211edc9c0	Merge pull request #9573 from VOREStation/upstream-merge-7786 ... [MIRROR] Gadgets & Gizmos	2021-01-24 06:55:05 +00:00
Razgriz	ec7f175d19	Merge pull request #1095 from cadyn/fixuplinks ... Fix uplinks	2021-01-08 19:44:21 -07:00
Cadyn	e20eb71125	Fix uplinks	2021-01-08 14:42:35 -08:00
Razgriz	ea80be587b	Merge pull request #750 from MisterGrimm/GoodbyeMicromechs ... Commenting out micro mech stuff	2021-01-08 15:20:57 -07:00
Nadyr	8459ce9c13	Update misc.dm	2021-01-03 21:35:50 -05:00
Chompstation Bot	d96a127b4a	Ports Vox Plushie from Paradise	2020-12-26 01:59:20 +00:00
Novacat	a412c08e06	Merge pull request #9491 from VOREStation/upstream-merge-7794 ... [MIRROR] Puts smelly pine tree over stinky event listeners	2020-12-22 15:17:11 +00:00
Chompstation Bot	7b30714172	[MIRROR] Adds & Upgrades a Bunch of Teshari Clothing	2020-12-04 20:07:48 +00:00
Cadyn	96c6d2e9ff	Kassc's POI/event requests	2020-10-29 16:05:26 -07:00
Razgriz	d88ccdabf6	Merge pull request #759 from CHOMPStationBot/upstream-merge-9207 ... [MIRROR] [MIRROR] Phoron bore utility improvements	2020-10-28 20:21:26 -07:00
Verkister	57adb0bfca	Merge pull request #9207 from VOREStation/upstream-merge-7680 ... [MIRROR] Phoron bore utility improvements	2020-10-27 08:16:22 +00:00
Sym	1173ddf675	Remove micro mech stuff ... Time to take out the trash.	2020-10-23 20:17:07 -04:00
Nadyr	e1c359c9d3	Merge pull request #716 from CHOMPStationBot/upstream-merge-9230 ... [MIRROR] [MIRROR] Adds tesla generator crate to cargo	2020-10-22 09:34:20 -04:00
Verkister	210505f2e4	Merge pull request #9230 from VOREStation/upstream-merge-7717 ... [MIRROR] Adds tesla generator crate to cargo	2020-10-19 10:38:51 +00:00
Chompstation Bot	77c15811a2	Datum Component System (/tg/ port)	2020-10-19 10:36:26 +00:00
Cadyn	07775449d7	Fixing conflicts	2020-10-05 18:10:53 -07:00
Razgriz	54e632ebf2	September 2020 Upstream Merge	2020-09-25 23:07:08 -07:00
ShadowLarkens	92ff2bcbf4	Recompile nanomaps, and add nanomap improvements	2020-09-25 03:52:49 -07:00
Novacat	d49640431d	Merge pull request #9062 from ShadowLarkens/tgui_finale ... NanoUI Goes To Brazil	2020-09-21 14:13:16 -04:00
SubberTheFabulous	378ba4f4c0	Adds two new augments to Traitor uplink	2020-09-20 06:49:58 -04:00
ShadowLarkens	3f191e4204	NanoUI Goes To Brazil	2020-09-20 02:36:46 -07:00
Braiden	c55ea87e94	Merge branch 'kbraid.edit/additions' of https://github.com/KBraid/YWPolarisVore into kbraid.edit/additions	2020-09-19 03:03:11 -05:00
Braiden	71266ace1e	added new plushies to drop lists	2020-09-19 03:03:09 -05:00
SplinterGP	7bf3fc31bc	Removes nanoUI autolathe code stuff.	2020-09-15 19:06:46 -03:00
izac112	9d8f2623de	More thingus	2020-09-14 14:09:52 +02:00