11045 Commits

Author	SHA1	Message	Date
Novacat	28c19ee066	Merge pull request #8868 from VOREStation/upstream-merge-7571 ... [MIRROR] Colony Director -> Site Manager	2020-08-28 13:17:58 -04:00
Novacat	25058122bf	Merge pull request #8826 from VOREStation/upstream-merge-7555 ... [MIRROR] Actually adds (and TESTS) exclude_mobs parameter to visible_message	2020-08-28 13:02:03 -04:00
Novacat	33b1eb1cdb	Update mob.dm	2020-08-28 12:38:16 -04:00
Novacat	f6e61ea8f1	Merge pull request #8658 from Rykka-Stormheart/shep-dev-ambience-additions ... Massive Ambience and Sound Overhaul + Addition	2020-08-28 00:47:23 -04:00
Novacat	4e2038b9c0	Merge pull request #8863 from VOREStation/upstream-merge-7565 ... [MIRROR] Fix ventcrawling while in 0 gravity	2020-08-28 00:19:02 -04:00
Novacat	e370fda424	Merge pull request #8859 from VOREStation/upstream-merge-7554 ... [MIRROR] Fixes turf slowdown not applying on non-water/snow turfs	2020-08-28 00:17:58 -04:00
Novacat	2dabf37c56	Merge pull request #8857 from VOREStation/upstream-merge-7553 ... [MIRROR] [Untested] Emotes won't be foiled by pesky capitals	2020-08-28 00:17:36 -04:00
Atermonera	21c1b12ef1	Colony Director -> Site Manager	2020-08-27 20:43:04 -04:00
Atermonera	109fc5259c	Merge pull request #7565 from Cyantime/patch-1 ... Fix ventcrawling while in 0 gravity	2020-08-27 20:36:48 -04:00
Atermonera	de5d1f6120	Merge pull request #7554 from Heroman3003/turfslow ... Fixes turf slowdown not applying on non-water/snow turfs	2020-08-27 19:57:37 -04:00
Atermonera	5ea4c84700	Merge pull request #7553 from Shadow-Quill/patch-1 ... [Untested] Emotes won't be foiled by pesky capitals	2020-08-27 19:47:44 -04:00
Rykka	d2fb9a7691	Rebase onto Master for Volume Control Panel, Squash Commits	2020-08-27 19:47:38 -04:00
Atermonera	63f7dd9417	Merge pull request #7480 from listerla/dionamarkings ... Ports Aurora Diona markings	2020-08-27 19:26:18 -04:00
Novacat	43360b19ce	Merge pull request #8844 from Rykka-Stormheart/shep-dev-scree-rabbits ... Adds Knights of the Round Table, Rabbits, Killer Rabbits	2020-08-27 15:52:54 -04:00
Novacat	fe8b90b3ee	Merge pull request #8835 from ShadowLarkens/tgui_inventory ... TGUI Drag Inventory	2020-08-27 15:52:07 -04:00
Rykka	48118b3eca	Changes desc to . and changes grumpiness to 0	2020-08-26 23:42:01 -04:00
Rykka	3b713c678d	Gives Killer Rabbit 2000 Health	2020-08-26 22:32:45 -04:00
Rykka	cf2a964018	Adds Rabbit to Predcrate, someone else can make a smaller crate ... Also fixes rabbit body colors	2020-08-26 22:23:45 -04:00
Rykka	6ef52be981	Adds Knights of the Round Table, Rabbits, Killer Rabbits ... Scree's Request! This adds the Knights of the Pizza Table (Monty Python's Knights) armor and costumes. Costumes are orderable via Cargo OR Vendors. This adds passive Rabbit voremobs, and a killer rabbit. If you pet the rabbit too much, you'll make it grumpy, and it will do a nomf. You can see their grumpiness level in their description/examine. Knight's Armor has good melee and bullet protection, and little else.	2020-08-26 21:58:30 -04:00
Novacat	85c425a2eb	Merge pull request #8841 from VOREStation/upstream-merge-7545 ... [MIRROR] Enables passtable for cleanbots	2020-08-26 09:44:51 -04:00
Novacat	29b1890de5	Merge pull request #8840 from VOREStation/upstream-merge-7541 ... [MIRROR] Prevent acid glands from melting non-simulated turfs	2020-08-26 09:06:55 -04:00
Novacat	e26273d905	Merge pull request #8839 from VOREStation/upstream-merge-7544 ... [MIRROR] Fixes eye glow appearance flags	2020-08-26 09:06:28 -04:00
Verkister	d9dbb7d1d7	Enables passtable for cleanbots (#7545) ... One of the most common reasons behind cleanbots getting stuck in stupid places is because they went after some mess underneath table/rack/railing/whatever without ever getting to reach it.	2020-08-26 03:52:25 -04:00
Cyantime	27913e5045	Prevent acid glands from melting non-simulated turfs (#7541)	2020-08-26 03:51:09 -04:00
Verkister	b65b82345b	Fixes eye glow appearance flags (#7544) ... Fixes eye glow layer not inheriting mob appearance flags.	2020-08-26 03:50:58 -04:00
Shadow-Quill	da96910c5c	Attack! (#7538)	2020-08-26 03:49:42 -04:00
ShadowLarkens	0c2c82fe5f	TGUI Drag Inventory	2020-08-25 21:56:51 -07:00
ShadowLarkens	264793b36a	Fading titlescreen from /tg/	2020-08-25 16:50:23 -07:00
Novacat	b5c884eb03	Merge pull request #8825 from ShadowLarkens/tgui_research_rebased ... TGUI Research	2020-08-25 17:12:24 -04:00
Novacat	7ae5bf301b	Merge pull request #8819 from dwinters99/gutterband ... Changes Gutter to Gutterband, removes whitelist.	2020-08-25 16:38:06 -04:00
ShadowLarkens	097d4fa283	TGUI Research	2020-08-25 13:30:47 -07:00
Atermonera	fbf39daacf	Actually adds (and TESTS) exclude_mobs parameter to visible_message	2020-08-25 00:31:12 -04:00
David Winters	42f2b58b25	Moved name change to define, removes legacy entries from alienwhitelist	2020-08-23 23:31:31 -04:00
Rykka	0014833e89	Fixes Mercs threaten timers, and threaten sounds ... The default "threaten" timer was 3 seconds, meaning that as soon as world.time advanced beyond that, the merc would shoot you. If there's TIDI/lag or other issues, you'd immediately end up getting shot. 30 seconds is more reasonable, allows you time to back away from the merc without being shot at, and it keeps the mercs from being cheesed easily. This also fixes the merc aggression sounds. Actual voicelines incoming once I get help from a contributor!	2020-08-23 18:47:02 -04:00
ShadowLarkens	ac03887a55	Merge remote-tracking branch 'upstream/master' into vore_overlays	2020-08-23 10:39:55 -07:00
David Winters	770cd596d9	Unwhitelist	2020-08-23 07:20:12 -04:00
Novacat	e2a8446396	Update robot.dm	2020-08-21 23:34:19 -04:00
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	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	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	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
Novacat	4374731142	Merge pull request #8783 from VOREStation/upstream-merge-7522 ... [MIRROR] Improve cleanbot ai slightly	2020-08-21 01:42:29 -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	4eb14e5a0d	Merge pull request #7522 from Meghan-Rossi/cleanbotaitweak ... Improve cleanbot ai slightly	2020-08-21 01:28:12 -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	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