Commit Graph

11083 Commits

Author SHA1 Message Date
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
KasparoVy
007b75dd7f Opens Taj Hairstyles to Same Species as Vulp Hairstyles
Bit more flexibility. Vulp, Sergal, Fennec & Zorren species can now use cool Tajaran hairstyles.
2020-08-21 14:01: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
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
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
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
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
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
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
Verkister
72a9604369 Buffs/fixes darksight traits.
The major trait was not quite what it advertised itself as (it counts the tile you're standing on, not the outer radius so it was never full view) and the minor was just utter waste of points.
2020-08-20 16:50:13 +03: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
Novacat
8079ce2f0f Merge pull request #8720 from ShadowLarkens/tgui_cargo
TGUI Cargo
2020-08-18 09:48:13 -04:00
Atermonera
e21b1b158f Merge pull request #7470 from Rykka-Stormheart/admin-ghost-examine-QOL
Admin ghosts can now examine other ghosts to pull up admin tools!
2020-08-17 18:09:20 -04:00