25616 Commits

Author	SHA1	Message	Date
Atermonera	3c67a19a20	Ports borg petting from CHOMPStation	2020-08-21 23:32:15 -04: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
Novacat	dc48492db5	Merge pull request #8774 from VOREStation/upstream-merge-7509 ... [MIRROR] Stop bots standing around blocking doors	2020-08-21 01:11:26 -04:00
Novacat	a117c4efc6	Merge pull request #8761 from VOREStation/upstream-merge-7487 ... [MIRROR] Adds shift-middle click pointing	2020-08-21 01:09:36 -04:00
Novacat	373b61c33c	Merge pull request #8772 from VOREStation/upstream-merge-7503 ... [MIRROR] Replaces cable attack_ghost with normal examine	2020-08-21 01:08:43 -04:00
Atermonera	e89409e64b	Emergency Travis Appeasement: Sacrifice of one Giant Spider, one HMS Jolly Pip, and one Capital City sacked and looted by Cultists	2020-08-21 00:12:11 -04:00
Meghan-Rossi	133296814a	Stop bots standing around blocking doors (#7509) ... * Idle bots will move out of doorways Idle bots will move out of doorways, including turfs with firedoors or blastdoors. * +changelog * fix parentheses	2020-08-20 22:32:09 -04:00
Atermonera	08cc205c35	Merge pull request #7503 from Cyantime/patch-2 ... Replaces cable attack_ghost with normal examine	2020-08-20 22:24:32 -04:00
Atermonera	4f0f345647	Merge pull request #7507 from listerla/shieldgen ... De-capitalizes shield generators	2020-08-20 22:24:21 -04:00
Atermonera	45b1b77f42	Merge pull request #7497 from Shadow-Quill/AdminPM ... Cancelling choosing someone to admin PM won't say "no mob"	2020-08-20 22:21:42 -04:00
listerla	85536ea0fd	Skrell blood is now hemocyanin-based (#7492) ... * Skrell blood is now hemocyanin-based Inspired by Aurora * Update Chemistry-Reagents-Dispenser.dm * Create Lorilili - hemocyanin.yml	2020-08-20 22:17:58 -04:00
listerla	ebbea6ebc8	Ports more Teshari clothes from Urist & Citadel (#7488) ... * Ports more Teshari clothes from Urist & Citadel * Accidentally deleted one sprite, undeleting now	2020-08-20 22:16:42 -04:00
listerla	7e65840937	Adds shift-middle click pointing (#7487) ... * Adds shift-middle click pointing * Borgs and buckled folk can now point * Create Lorilili - pointing.yml	2020-08-20 22:15:16 -04:00
Mechoid	170b9a7513	FBP Internal Components	2020-08-20 21:40:15 -04:00
Atermonera	1e9e8c2c60	Flavour Enhancement: Vending	2020-08-20 21:25:31 -04:00
SplinterGP	cf491a56b7	Gives FBP's a proc to change their monitor display without using a mask item.	2020-08-20 21:25:20 -04:00
Mechoid	496322f4f1	Reagent Hoses	2020-08-20 21:24:06 -04:00
Atermonera	9c966b934c	Merge pull request #7428 from lbnesquik/Kot-Borg-Tweak ... Small tweaks to cyborg verbs and icon	2020-08-20 21:23:52 -04:00
Novacat	283db98f36	Merge pull request #8726 from Rykka-Stormheart/shep-dev-spicy-fewd ... Adds Spice Resistence/Intolerance Traits, Makes Frost Oil COLD	2020-08-20 18:54:05 -04:00
ShadowLarkens	02bb4637eb	TGUI Point Defense Mainframe & Advanced Shield Generator	2020-08-18 20:42:59 -07:00
ShadowLarkens	48b630891e	TGUI Overmap Shuttle Controls	2020-08-18 20:42:12 -07:00
Novacat	2cb854cb1b	Merge pull request #8731 from ShadowLarkens/tgui_security ... TGUI Security	2020-08-18 23:41:32 -04:00
Novacat	4b44d10d34	Merge pull request #8366 from lbnesquik/Kot-Traits-Addition ... Bring back hemophilia. No, it's not a crime!	2020-08-18 20:49:44 -04:00
ShadowLarkens	c4843f023a	Add other plane masters that were missed to fix camera consoles displaying stuff they shouldn't	2020-08-18 14:26:04 -07:00
Novacat	95044666b0	Merge pull request #8737 from Rykka-Stormheart/shep-dev-nt-uniform-fix ... Fixes Nanotrasen Uniforms to account for Solgov Path Changes	2020-08-18 17:15:45 -04:00