Commit Graph

12196 Commits

Author SHA1 Message Date
Pandora 77e39ed5b6 Add files via upload 2022-04-04 20:42:13 +01:00
Pandora b250b5963b Add files via upload 2022-04-04 20:41:26 +01:00
VerySoft b31ee089ac GB Update
New stuff!
2022-04-04 13:38:08 -04:00
Heroman 2dd9862192 Adds suslug 2022-04-03 17:53:55 +10:00
Casey b9473ccb94 Merge pull request #12592 from GhostActual/tg-port-6
The Grand /TG Port - Part 6
2022-04-02 23:31:31 -04:00
Casey 5d9f0462c1 Merge pull request #12579 from GhostActual/tg-port-5
The Grand /TG Port - Part 5
2022-04-02 23:30:27 -04:00
Casey 18bed5ef67 Merge pull request #12575 from GhostActual/tg-port-1
The Grand /TG Port - Part 1
2022-04-02 23:24:08 -04:00
GhostActual 81c603f9d5 Base Commit 2022-04-02 22:54:14 -04:00
VerySoft 946b76e933 Updates On-Death message
based on https://github.com/VOREStation/VOREStation/pull/12569 I just didn't like the tone of their edit, so I made my own!
2022-04-02 22:31:41 -04:00
Amaya 0c98fc18e7 adjustments 2022-04-03 01:11:39 +02:00
Amaya a05197ae85 initial 2022-04-03 00:57:39 +02:00
GhostActual 3d57004141 Base Commit 2022-04-01 13:45:16 -04:00
GhostActual 801533a69f Revert "Base Commit"
This reverts commit 1de45df2ba.
2022-04-01 13:39:44 -04:00
GhostActual 1de45df2ba Base Commit 2022-04-01 13:33:51 -04:00
Casey 29ad6e8c73 Merge pull request #12573 from Rykka-Stormheart/shep-dev-xenochimera-hiss
Allows Xenochimera to take Autohiss
2022-04-01 12:59:48 -04:00
VerySoft ffb06bb3c8 The last one hopefully 2022-04-01 12:44:05 -04:00
VerySoft 201b05d61d YEAH 2022-04-01 10:55:57 -04:00
VerySoft 65434b62e9 I am so sleepy 2022-04-01 09:39:47 -04:00
GhostActual ef2ef019cb Base Commit 2022-04-01 03:33:58 -04:00
Rykka 1454b8b5bc Allows Xenochimera to take Unathi + Tajaran Autohiss 2022-03-31 19:02:31 -06:00
Rykka 16ff89b756 Adds Temperature Adaptations to Xenochimera Trait List along with Autohiss.
Ran these by Scree (Creator of Xenochimera) and he said these are fairly reasonable adaptations.

They're neutral traits available to custom species, and given that Xenochimera are also able to pretty much mix and match a lot of stuff based on what they've eaten/evolved, this will allow greater roleplay/adaptations to occur - for instance, a xenochimera that is well-suited to the warmth of the desert is going to struggle in cold areas, and vice versa.

(It's conceivable that a Xenochimera might eat a wolf, and adapt/evolve a super-thick coat of fur suited for winter planets.)

Upstream port of https://github.com/CHOMPStation2/CHOMPStation2/pull/2948
2022-03-31 19:01:05 -06:00
Casey 461aa0a224 Merge pull request #12560 from Heroman3003/xenobio-fixes2
More xenobio fixes
2022-03-28 19:07:05 -04:00
Casey 084441d48b Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol
Xenochimera QOL PR
2022-03-28 19:05:19 -04:00
Heroman 7887f6c12f More xenobio fixes 2022-03-28 15:47:07 +10:00
Rykka 6e3d0f7238 Removes pain on defib for everyone, and removes xenochimera lick wounds
Pending re-addition later for Xenochimera-specific implementation.
2022-03-27 18:59:22 -06:00
Rykka 26b511cbe9 Adds Coyote Awoo Emotes, now with EVEN MORE awoo-age!
Upstream port of https://github.com/CHOMPStation2/CHOMPStation2/pull/3816

...but with this amazing offer we'll throw in 4 MORE AWOOS FOR THE PRICE OF ONE!

Coyawoo is the main awroo.
Coyawoo2 is a lengthy howly-awoo.
Coyawoo 3 is a short yap, and awoo.
Coyawoo 4 is several yaps and a short awoo.
Coyawoo 5 is a whiny-grumble awoo-ish sound.
2022-03-27 16:55:28 -06:00
Rykka 079c2fd436 Xenochimera Feral Reduction in Darkness OR Belly
Xenochimera will now reduce ferality at a tickrate of 1 per Life tick while inside a belly or in darkness, same as the hunger reduction if they're full.
They will not experience hallucinations and will get safety messages while inside a belly, as well as the status indicator confirming they're safe even in a lit environment.

In total:
If sated, feral will reduce by 1 per Life() tick.
If in darkness _or_ a belly, feral will reduce by 1 per Life() tick.
A feral of 220 will take 110 seconds to clear if satiated, not in a belly, and in light.
Alternatively, it will take 55 seconds to clear if satiated **and** either in a belly _or_ in the darkness.

Upstream port of https://github.com/CHOMPStation2/CHOMPStation2/pull/3823
and
https://github.com/CHOMPStation2/CHOMPStation2/pull/3906
2022-03-27 16:27:44 -06:00
Rykka d4fb27da6f Xenochimera QOL PR
Adds Regenerating + Hatch thrown alerts, similar to stunned/weakened/buckled, and clicking will show the remaining time to revive, or allow you to hatch.
Defibrillators will now apply halloss to Xenochimera and set them feral on revive.
Defibrillators will now apply halloss (pain) to everyone on revive.
Medscanners will now display if a Xenochimera is regenerating or needs more protein, and if a 'chimera is dead, will warn that they require sedation.
Reconstitution cooldown reduced from 1 hour to 10 minutes.
Regeneration will no longer handle ferality in the middle of it, preventing edge-case *twitches while clearly regenerating.
Regeneration will now have an audible + visible cue that plays on a 2% chance.
Xenochimera have gained the Lick Wounds Verb.
Lick Wounds has been modified to allow treating self-injuries, and injuries of the mob next to you. Given how limited the use is and how often bandages + chems are just flat-out better, this shouldn't be a huge balance issue, IMO.
2022-03-27 16:22:46 -06:00
Casey bd65b8dc0f Merge pull request #12551 from BonniePandora/spaceslug
Adds a new catslug, Miros, to the fuel depot
2022-03-27 15:19:08 -04:00
Pandora b8a5fb1522 I may be stoopid 2022-03-27 20:03:12 +01:00
Casey 754c2d36e4 Merge pull request #12554 from Heroman3003/amberson
Re-enables Amber Slime's feed aura (with restrictions)
2022-03-27 14:59:10 -04:00
Heroman eb30dfc424 Re-enables Amber Slime's feed aura (with restrictions) 2022-03-28 04:01:13 +10:00
Heroman 56849e7a71 Reworks xenobio extract rewards 2022-03-27 14:17:41 +10:00
Pandora a9df95e5d4 Catslugs can into space (#17)
* Update catslug.dm

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload
2022-03-27 05:14:01 +01:00
VerySoft 5f0e8705da Find Auto Resleever
Adds a ghost verb 'Find Auto Resleever'

This picks a random auto resleever somewhere in the world and teleports the ghost to it.
2022-03-25 16:13:46 -04:00
VerySoft 13e8bf9d8d Auto-Resleeving
Adds auto-resleeving!

Under normal conditions, this allows one to resleeve their character after they have died in the round. 

The auto-resleever requires a bit of time after death to be used:

-Characters who died due to vore reasons must wait 15 minutes

-Characters who died for other reasons must wait 30 minutes

The auto-resleever only requires power, there is no biomass requirement.

The auto-resleever also works for species that can ordinarily not be resleeved, since the potential for abuse there is minimal.

To use the auto-resleever, one only needs to click it as a ghost. If it is ready to revive you, it will pop up a confirmation dialogue.

Additionally, the automatic transcore notification, and the 'Cancel Transcore Notification' verb has been removed. Ghosts have a 'Notify Transcore' verb, which can be used around 5 minutes after death if they wish to notify medical.

This should eliminate false positives for medical, because no one likes resleeving people who don't need it.

This does not otherwise alter the original resleeving process or machines.

The auto-resleever for the tether is on Z1, just south of the psych office. It also features a return chute for items right next to the door. (I wanted to put it in the resleeving room's cleaning room, but it's really far into medical)

The auto-resleever for the stellar delight is in the resleeving's cleaning room.

I also fixed the access on the tourbus's APC while I was there.
2022-03-25 02:49:10 -04:00
FartMaster69420 5f54623fbc Adding OOC Notes to blobs
Whoops, forgot to do this. Now OOC Notes will be transfered to prommie blobs.

As an added bonus, the same functionality was added to protean blobs. Wow!
2022-03-23 14:43:11 -04:00
GhostActual 61462f99e8 Base Commit 2022-03-21 16:32:15 -04:00
Casey 761ebc2930 Merge pull request #12494 from FartMaster69420/prommie-blob
Fixing Blob Hats
2022-03-20 18:30:52 -04:00
FartMaster69420 54983b8dc8 Fixing hat color!
This also fixes it for xenobiology slimes.
2022-03-20 15:41:05 -04:00
listerla dfa2a9bcc4 Skrell markings & hair angle consistency 2022-03-20 15:13:04 -04:00
Casey 8c2a8f75e4 Merge pull request #12469 from VOREStation/upstream-merge-8428
[MIRROR] Makes the chirp emote available to Zaddat
2022-03-20 15:11:03 -04:00
Casey aa1fce2d49 Merge pull request #12471 from VOREStation/upstream-merge-8426
[MIRROR] Prometheans now do not clean items through gloves.
2022-03-20 15:10:26 -04:00
FartMaster69420 e6ee9d6ff2 Fixing color bug
A small bug was found when solid white (FFFFFF) blobs turned into prometheans, resulting in the promethean being the incorrect color. This fixes that issue.
2022-03-20 14:56:56 -04:00
Atermonera 6e6c2c7c3e Merge pull request #8426 from Mechoid/PrometheanHandClean
Prometheans now do not clean items through gloves.
2022-03-20 14:54:42 -04:00
Atermonera 1680f559ff Merge pull request #8428 from listerla/zaddatchirp
Makes the chirp emote available to Zaddat
2022-03-20 14:54:30 -04:00
VerySoft ff6079ff0d Promethean blobs should understand the radio now. 2022-03-20 06:07:31 -04:00
Casey f233c511e7 Merge pull request #12451 from FartMaster69420/prommie-blob
Promethean Blobform
2022-03-20 02:45:08 -04:00
FartMaster69420 c5b52849b1 Saving the blob instead of deleting it
Saves the blob instead of deleting it!
2022-03-20 01:57:56 -04:00
Casey e45c901f7c Merge pull request #12443 from GhostActual/detective_guns
Colts, Revolvers, and Tasers
2022-03-19 23:10:15 -04:00