Commit Graph

12214 Commits

Author SHA1 Message Date
Casey
018bf18dc5 Merge pull request #12745 from CubeJackal/master
Add eastern dragon taur suit sprites
2022-04-17 05:23:08 -04:00
Casey
6a2e26314e Merge pull request #12739 from GhostActual/late_at_night
Late Night Stuff
2022-04-17 05:20:17 -04:00
FartMaster69420
b3da886943 Adding Prefs
Adds prefs, changes knocking people over to only trigger on lightweight trait havers, and lets the biggest of guts give a big bounce.
2022-04-15 21:20:05 -04:00
CubeJackal
673571c90d Add eastern dragon taur suit sprites
Adds the following suit sprites for the eastern dragon taur: common hardsuits (eng, atmos, med, EMT, sec, mining, explo, field med), biosuits (viro, sec, jani, sci, CMO), and the emergency softsuit (orange syndicate spacesuit icon).
2022-04-15 19:11:16 +01:00
GhostActual
1ac8b601a6 Base Commit 2022-04-15 04:19:08 -04:00
FartMaster69420
2c6cc7f146 Flight Vore Toggle
Adding a toggle to enable flight vore
2022-04-14 23:33:25 -04:00
Casey
cdb1b8f43d Merge pull request #12720 from liache/Liache-PatchGrippers
Update drone_items.dm Magnetic Gripper
2022-04-12 21:40:48 -04:00
liache
82d7e2a758 Update drone_items.dm 2022-04-12 20:58:21 -04:00
CubeJackal
3b597ff680 Adds eastern dragon taur sprite
Three colours, clipping mask included. Enjoy spaghetti.
2022-04-12 18:42:09 +01:00
Heroman
a22c2be869 Makes NIFSoft vision modifiers mutually exclusive with goggle/visor based ones 2022-04-10 07:35:31 +10:00
Casey
95a8dcf4f1 Merge pull request #12671 from Verkister/patch-113
Makes mobs not spawn with id unless defined so
2022-04-06 17:27:53 -04:00
Pandora
706c9f767d Forgor those bits. 2022-04-06 16:20:55 +01:00
Pandora
3f9b61a0d5 Update catslug.dm 2022-04-06 15:55:52 +01:00
Verkister
e706322e6b Update simple_mob.dm 2022-04-06 15:19:40 +03:00
Verkister
b7ff309b13 Update catslug.dm 2022-04-06 15:18:35 +03:00
Verkister
1033650c66 Makes mobs not spawn with id unless defined so
Makes mob ids only spawn on mobs that should come with them rather than jamming one into every single mouse and cockroach and so on.
2022-04-06 15:16:54 +03:00
VerySoft
d191eb73af Allow mobs to ventcrawl with their mobid
Also lets drones vent with their emissive blockers
2022-04-05 22:06:24 -04:00
Spookerton
6dfc5c2db1 Merge pull request #8494 from Verkister/patch-90
Fixes runtime with turrets and viscerators
2022-04-05 14:45:38 -04:00
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