25639 Commits

Author	SHA1	Message	Date
David Winters	42f2b58b25	Moved name change to define, removes legacy entries from alienwhitelist	2020-08-23 23:31:31 -04:00
David Winters	770cd596d9	Unwhitelist	2020-08-23 07:20:12 -04:00
Novacat	9774efc116	Merge pull request #8811 from ShadowLarkens/fix_asset_cache_runtime ... "Fix" asset cache json runtime	2020-08-22 20:39:51 -04:00
ShadowLarkens	0c65f751fa	"Fix" asset cache json runtime	2020-08-22 14:13:48 -07:00
Kates	8a138ee94e	Add a zero to the translocator.	2020-08-22 22:48:32 +02:00
lbnesquik	472685cd25	Correct price errors introduced in UI update. Also shuffle a few things so there is no random spaces in the vendor.	2020-08-22 20:36:21 +02:00
Novacat	9b802e87f9	Merge pull request #8805 from VOREStation/upstream-merge-7526 ... [MIRROR] Fixes mobs being able to ventcrawl while buckled	2020-08-22 09:23:33 -04:00
Novacat	8df4b70b00	Merge pull request #8804 from VOREStation/upstream-merge-7530 ... [MIRROR] Disables Swarmer Drones	2020-08-22 09:23:20 -04:00
Novacat	3b5fd1a52f	Merge pull request #8802 from VOREStation/upstream-merge-7536 ... [MIRROR] Fixes a copypaste slip with heat protection	2020-08-22 09:23:05 -04:00
Novacat	307793ba10	Merge pull request #8801 from VOREStation/upstream-merge-7532 ... [MIRROR] Makes unbreakable walls unacidable	2020-08-22 09:22:50 -04:00
Verkister	138a05c2a8	Fixes mobs being able to ventcrawl while buckled (#7526) ... No more mice teleporting office chairs all over the station.	2020-08-22 04:24:31 -04:00
Neerti	205aef2e07	Disables Swarmer Drones (#7530) ... I actually forgot to do this before the event system went permanently live so that's on me. Anyways this turns off swarmer drones from being able to be picked by the GM system, since right now they're, to put it charitably, poorly balanced and implemented (being super-maint drones is very clunky to me but thats not the main thing). When the GM system spawns one in, it tends to result in a ghost becoming the drone, then that player essentially never being able to lose due to infinite re-tries and the crew has to fight off drones for the rest of the round or until they or the drone gets bored. There's been quite a few number of rounds that have devolved due to them so for now it's probably best to turn them off for the time being.	2020-08-22 04:24:20 -04:00
Verkister	f511641363	Fixes a copypaste slip with heat protection (#7536) ... Found while digging around for something else	2020-08-22 04:12:32 -04:00
Cyantime	d8dcc61ea5	Makes unbreakable walls unacidable (#7532)	2020-08-22 04:11:17 -04:00
Novacat	9e60838354	Update occupation.dm	2020-08-22 01:48:52 -04:00
Atermonera	4097a3c765	Allows you to right click to lower job preference	2020-08-22 01:41:52 -04:00
Novacat	87f2c0c594	Merge pull request #8798 from VOREStation/upstream-merge-7484 ... [MIRROR] Adds Repeating Ambience and Ambience Chance Preferences!	2020-08-22 00:47:08 -04:00
Novacat	d4832478e2	Merge pull request #8799 from VOREStation/upstream-merge-7478 ... [MIRROR] Ports borg petting from CHOMPStation	2020-08-22 00:24:41 -04:00
Novacat	e2a8446396	Update robot.dm	2020-08-21 23:34:19 -04:00
Novacat	405ca5c158	Merge pull request #8797 from Heroman3003/ahelpfeed ... Replace another instance of IRC with Discord in ahelp verb feedback messages	2020-08-21 23:32:38 -04:00
Atermonera	3c67a19a20	Ports borg petting from CHOMPStation	2020-08-21 23:32:15 -04:00
Novacat	84f16fecc2	Update 01_ui.dm	2020-08-21 23:32:07 -04:00
Atermonera	325afb857e	Adds Repeating Ambience and Ambience Chance Preferences!	2020-08-21 23:30:59 -04:00
Heroman3003	34eb48c770	Replace another instance of IRC with Discord in ahelp verbs	2020-08-22 12:13:10 +10:00
Novacat	25e369e173	Merge pull request #8656 from serenekerosene/VOREstation ... Less wind per wind Correct Edition	2020-08-21 17:13:12 -04:00
Novacat	6dd814c4d6	Merge pull request #8725 from dwinters99/flintlock_jacket ... Flintlock's jacket	2020-08-21 17:12:31 -04:00
Novacat	16465b5618	Merge pull request #8728 from VOREStation/upstream-merge-7466 ... [MIRROR] Adds wearing cones and caution signs	2020-08-21 13:33:08 -04:00
Novacat	ab88747252	Merge pull request #8755 from VOREStation/upstream-merge-7452 ... [MIRROR] Gives FBP's a proc to change their monitor display without using a mask item.	2020-08-21 13:32:51 -04:00
Novacat	a6efe9acbb	Merge pull request #8756 from VOREStation/upstream-merge-7449 ... [MIRROR] Flavour Enhancement: Vending	2020-08-21 13:32:37 -04:00
Novacat	4082d5355b	Merge pull request #8785 from VOREStation/upstream-merge-7523 ... [MIRROR] Ghost sechud verb, shift-click examine, alt-click turf tab	2020-08-21 13:32:20 -04:00
Novacat	1b27dffb9d	Merge pull request #8757 from VOREStation/upstream-merge-7445 ... [MIRROR] FBP Internal Components	2020-08-21 13:32:02 -04:00
Rykka	56ee47720b	Fix Merge Conflict in #8755	2020-08-21 07:54:07 -04:00
Verkister	5c50080377	Merge pull request #8754 from VOREStation/upstream-merge-7386 ... [MIRROR] Reagent Hoses	2020-08-21 14:25:55 +03:00
Verkister	929ce6c728	Merge branch 'master' into upstream-merge-7386	2020-08-21 14:12:26 +03:00
Rykka	16da38037d	Fix incoming merge conflicts with PR #8757 ... NIF Heatsinks will preserve their behavior of preventing BASE heat increases, but will not be able to compensate for if your NEW heatsink component is damaged or disabled. Robolimb damage remains scalable as the conflict was simply taht the check was indented/nested underneath another.	2020-08-21 05:26:49 -04:00
ShadowLarkens	7aaa40b62c	Beginnings of a global volume control system	2020-08-21 04:42:47 -04:00
Novacat	4374731142	Merge pull request #8783 from VOREStation/upstream-merge-7522 ... [MIRROR] Improve cleanbot ai slightly	2020-08-21 01:42:29 -04:00
Novacat	4dc293b831	Merge pull request #8784 from VOREStation/upstream-merge-7521 ... [MIRROR] Adds metamorphic pint glasses to RSF, autolathe, supply packs	2020-08-21 01:42:13 -04:00
Novacat	10bcf007c5	Merge pull request #8782 from VOREStation/upstream-merge-7519 ... [MIRROR] Allows building plating on grass	2020-08-21 01:41:51 -04:00
Novacat	c55f47fe64	Merge pull request #8778 from VOREStation/upstream-merge-7534 ... [MIRROR] Emergency Travis Appeasement: Sacrifice of one Giant Spider, one HMS Jolly Pip, and one Capital City sacked and looted by Cultists	2020-08-21 01:41:39 -04:00
Atermonera	8fc35d4da4	Merge pull request #7523 from Meghan-Rossi/ghostqol ... Ghost sechud verb, shift-click examine, alt-click turf tab	2020-08-21 01:30:40 -04:00
Atermonera	4a6d87c3a5	Merge pull request #7521 from Meghan-Rossi/metapint ... Adds metamorphic pint glasses to RSF, autolathe, supply packs	2020-08-21 01:28:23 -04:00
Atermonera	4eb14e5a0d	Merge pull request #7522 from Meghan-Rossi/cleanbotaitweak ... Improve cleanbot ai slightly	2020-08-21 01:28:12 -04:00
Atermonera	83e9effdf7	Merge pull request #7519 from Meghan-Rossi/grassbuilding ... Allows building plating on grass	2020-08-21 01:26:56 -04:00
Atermonera	0ebcca246e	Merge pull request #7518 from Meghan-Rossi/borgcookfix ... Fix cyborgs not being able to cook	2020-08-21 01:25:40 -04:00
Novacat	d63f0b2c3e	Merge pull request #8665 from Rykka-Stormheart/shep-dev-mech-combat ... Adds Mech Toy Battles!	2020-08-21 01:14:42 -04:00
Novacat	89b0fa6b79	Merge pull request #8708 from Rykka-Stormheart/shep-dev-persistence-megapatch ... Persistence Patch	2020-08-21 01:14:04 -04:00
Novacat	52e67d6ed2	Merge pull request #8763 from VOREStation/upstream-merge-7488 ... [MIRROR] Ports more Teshari clothes from Urist & Citadel	2020-08-21 01:12:20 -04:00
Novacat	9207c1dd50	Merge pull request #8764 from VOREStation/upstream-merge-7492 ... [MIRROR] Skrell blood is now hemocyanin-based	2020-08-21 01:12:00 -04:00
Novacat	c41e350d6d	Merge pull request #8768 from VOREStation/upstream-merge-7497 ... [MIRROR] Cancelling choosing someone to admin PM won't say "no mob"	2020-08-21 01:11:43 -04:00