Commit Graph

31214 Commits

Author SHA1 Message Date
Fluffy
a21e5d92ef fix (#17066) 2023-08-12 17:35:50 +00:00
Fluffy
e08efd64e6 Refactor and dmdoc ss material (#17046)
* Atomization

* sdfasddfa

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-08-12 12:41:02 +00:00
Leudoberct1
8cd1cf880a Adds cryptobiolin and impedrezene to the anomaly toxins trigger. (#17034)
* Adds cryptobiolin and impedrezene to the toxin triggers for anomalies.

* Changelog
2023-08-12 12:40:55 +00:00
feartheblackout
eb7cf654e6 Adds 2 new flags/banners: Orion Express, Imperial Frontier (#16423)
* Adds 2 new flags/banners: Orion Express, Imperial Frontier

* Makes Orion Express banner smaller

* but for real this time?
2023-08-12 12:40:51 +00:00
Fluffy
64643d9ec4 Ut create destroy tempfix (#17057)
* Atomization

* sdf

* dsfa

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-08-12 10:17:35 +00:00
feartheblackout
82822b5037 Adds secondary languages processors for Vaurcae (#17025)
* Adds the secondary language processors + changelog

* Implements RustingWithYou's suggestion
2023-08-10 11:50:11 +00:00
SleepyGemmy
0acb6076a1 Adrenaline Sac Rebalancing (#16936)
* Revives 16755

* Double Citation Fix
2023-08-10 11:49:36 +00:00
Cody Brittain
c6605e9b1c Added apprentice alt-titles for Security and Engineering (#16917)
* Added apprentice alt-titles for Security and Engineering

* CL

* Update html/changelogs/GeneralCamo - Cadet Alt Titles.yml

* Fix build

* Added age restrictions for intern alt-titles per code review

* Fix missing parameter in character setup (broke per-species alt title age restrictions)
2023-08-10 11:47:41 +00:00
Doxxmedearly
bfbd350135 Word shifts (#16988) 2023-08-10 11:31:38 +00:00
TheStryker
546d5af4d6 Adds Trinary Perfection robes. (#16953)
* adds trinary stuff

* changelog

* reverts .dme

* more fixing of stuff

* fixes more

* adds templeist quotes

* fixes loadout

* trinary
2023-08-10 11:04:11 +00:00
Matt Atlas
ad83af2bc3 Fixes a few bugs. (#17048)
* Fixes a few bugs.

* bodybag

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-08-10 11:04:05 +00:00
Cody Brittain
a79619c274 Bumps FontAwesome to 6.4.2 (#17036)
* Bumps FontAwesome to 6.4.2

* TTF File inclusion

* CL
2023-08-10 11:04:00 +00:00
Cody Brittain
34d6e6b08a Binary Atmospherics TGUI port (#17037)
* Ports binary atmospherics stuff to TGUI

* Finish port to TGUI

* RM now obsolete NanoUI files
2023-08-10 11:03:53 +00:00
Fluffy
4350abf61b Recipe tests fix materials deletion (#17045)
* Atomization

* fsdfsad

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-08-09 14:55:38 +00:00
Fluffy
56696fb71c Roundstart logout report, spawn to timer (#17044)
* Atomization

* dsf

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-08-08 19:15:05 +00:00
feartheblackout
030abf163b Raises thetamycin bottles in NanoMed Plus from 1 to 2 (#16364)
* Raises thetamycin bottles in NanoMed Plus from 1 to 2

* Changelog
2023-08-08 01:04:21 +00:00
RustingWithYou
012f28c2e5 Minor Updates for Titan Rises Arc (#16997)
* guild mantle

* description updates

* changelog
2023-08-08 00:22:26 +00:00
RustingWithYou
36481ec455 New Pirate Voidsuits & Tarwa Fixes (#16999)
* fixes tarwa suit

* new pirate suits + antag crate tweaks
2023-08-08 00:22:19 +00:00
Doxxmedearly
1dca31c90e Fixes more uninteractable effects (#17038) 2023-08-07 22:42:58 +00:00
Ramke
c16b98a568 the meal (#17014) 2023-08-07 10:12:28 +00:00
Ramke
cf927c8d64 wow even more varieties of spam (#17015) 2023-08-07 10:12:22 +00:00
Pirouette
e7fa991ff4 Nralakk uniforms in Diona loadout fix (#17018)
* Nralakk unifoms in Diona loadout fix

* Update code/modules/client/preference_setup/loadout/items/xeno/diona.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-08-07 10:12:20 +00:00
Pirouette
f9b94fd4a8 typo fixes (#17019) 2023-08-07 10:12:18 +00:00
Fluffy
b183188689 Better logging (#16164)
* Initial

* Cleared duplicates

* More work, get rid of log_error

* more

* log_debug() to macro LOG_DEBUG

* More work

* More

* Guh

* Maybe better?

* More work

* gah

* Dear lord

* *inserts swears here*

* gdi

* More work

* More

* dear lord

* fsdfsdafs

* rsdaf

* sadfasf

* sdafsad

* fgsd

* small fuckup fix

* jfsd

* sdafasf

* gdi

* sdfa

* sfdafgds

* sdafasdvf

* sdfasdfg

* sdfsga

* asdf

* dsfasfsagf

* ihibhbjh

* fsadf

* adfas

* sdafsad

* sdfasd

* fsda

* vhb

* asf

* for arrow

* removed source file-line logging, added header for tgui
2023-08-05 21:53:11 +00:00
CampinKiller24
c213f717ba Fixes Crushing People Out of Viewing Range (#17021)
* Update grip.dm

* changelog ig

* remove check
2023-08-05 18:41:09 +00:00
Alberyk
44492a169c Custom items 28/07/23 (#16895)
* Custom items 28/07/23

* Update code/modules/customitems/item_defines.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-08-05 13:59:44 +00:00
DreamySkrell
d2c59b4024 Voting panel sorted (#16991)
* a

* lint

* total_players_ready and total_players

* lint fix

---------

Co-authored-by: DreamySkrell <>
2023-08-05 13:36:59 +00:00
io
0628c80027 Fixes explosion adminlog by adding a jump button to it (#17006)
* adds jump button to explosion adminlog

* adds the changelog
2023-08-04 14:51:00 +00:00
naut
fa94e54788 Adds Cytophenolate, a new immunosuppressant (#16958)
* Immunosuppressant

* chagnelgo

* slows metabolism down to make prescription meds not overly tedious

* CL update

* Update code/modules/organs/organ.dm

---------

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2023-08-04 14:43:42 +00:00
Doxxmedearly
41f25c7eca Allows drones to enter robotic storage (#16992) 2023-08-04 14:30:04 +00:00
OolongCow
50f70fefd3 adds white webbings to medical lockers (#16975) 2023-08-04 14:30:01 +00:00
DreamySkrell
5f93a29a8c a (#16954)
Co-authored-by: DreamySkrell <>
2023-08-04 14:29:58 +00:00
Sparky
ed363dce3a Allows portraits/icons to be stored in wallets. (#16973)
This allows you to put the Tajaran leader picture, or the Dominian Goddess/matyr icons, into wallets.
2023-08-04 14:27:56 +00:00
Doxxmedearly
21f92e65fd Paxazide stops harm intent (#16940)
* Paxazide stops harm intent

* Update code/modules/mob/living/life.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-08-04 11:31:42 +00:00
Doxxmedearly
c0bff2b352 Potassium Chloride/Chlorophoride Adjustments (#16938)
* Potassium Chloride/Chlorophoride Adjustments

* Update code/modules/organs/internal/heart.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

---------

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2023-08-03 22:51:31 +00:00
DreamySkrell
d0c758cdf1 Replace /pottedplant/random with /random/pottedplant/ (#16944)
* madness

* changelog

* haha changelog fail

* post merge fix

* huh

* post merge fix

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

---------

Co-authored-by: DreamySkrell <>
2023-08-03 22:51:25 +00:00
DreamySkrell
8a159ac67a Loadout items folder structure refactor (#16952)
* a

* dme sorting

---------

Co-authored-by: DreamySkrell <>
2023-08-03 22:51:23 +00:00
Matt Atlas
49000133c8 Fixes the machinery unit test failure. (#17003)
* Fixes the machinery unit test failure.

* whoops

* whoops 2

* update that

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-08-03 14:06:06 +00:00
Doxxmedearly
d612461185 Fixes genetic death message spam (#16989) 2023-08-03 13:22:41 +00:00
Matt Atlas
d46621556e Re-adds UI interaction sounds to modular computers. (#16904)
* Re-adds UI interaction sounds to modular computers.

* Apply suggestions from code review

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-08-02 15:17:43 +00:00
Geeves
d0488e5068 Viscerator Grenade Tweaks (#16913) 2023-08-02 13:29:07 +00:00
Matt Atlas
7696aa5e81 Fixes Set Religion and Invite to Revolutionaries/Loyalists. (#16959)
* Fixes Set Religion and Invite to Revolutionaries/Loyalists.

* cl

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-08-02 13:28:22 +00:00
Alberyk
8f7653dd2e Overmap fun (#16894) 2023-08-01 20:57:50 +00:00
Matt Atlas
f382894aee Psionic fixes and tweaks. (#16976)
* Psionic fixes and tweaks.

* skrell psionic points to 2, command removal

* dd

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-08-01 20:42:01 +00:00
naut
4b1ef08141 Makes IV tank valves automatically open when strapping masks (#16914)
* Automatically opens valves for IV masks

* tank check

* log of change

* sound removal
2023-08-01 17:44:08 +00:00
RyverStyx
f7c75ee30a Adds Sol Common as an Option for Skrell (#15987)
* Update skrell.dm

* Create skrolcommon.yml
2023-08-01 12:31:04 +00:00
Doxxmedearly
1874ac2602 Fixes drones unable to use closet toggle open (#16956) 2023-08-01 11:24:00 +00:00
Werner
aefb697ed1 Fixes spawning with psionics. (#16969)
Fixes a error when sanitizing a character that doesnt have psionics.
Fixes #16966

Co-authored-by: Werner <Arrow768@users.noreply.github.com>
2023-07-31 23:39:56 +02:00
DreamySkrell
a331591bbe Robotics lift extended to third deck (#16864)
* kinda sorta works

* mapping mostly

* mapping

* holy hell it works

* lift sounds

* mapping

* multi/lift type

* mappin

* code

* ui

* code

* c

* remove old lift stuff

* weary

* Update code/modules/shuttles/shuttle_console_multi_lift.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/shuttles/shuttle_console_multi_lift.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/shuttles/shuttles_multi_lift.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/shuttles/shuttle_console_multi_lift.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/shuttles/shuttles_multi_lift.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/shuttles/shuttles_multi_lift.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update html/changelogs/DreamySkrell-robotics-lift-1111.yml

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* emergency stop

* Update code/modules/shuttles/shuttles_multi_lift.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

---------

Co-authored-by: DreamySkrell <>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-07-31 20:11:45 +00:00
Matt Atlas
d9b79db97b Psionics Rework: Kyoushiki Murasaki (#16951)
* Your unbeatable smile wrecks the media

 We wanna know your secret, so mysterious

* Even the things she lacks end up in her area

Such a perfect liar, you are

* Miss ingenious, godly idol!

(You're my savior, you're my saving grace)

* So, what'd you eat today?

What's your favorite book?

* And if you wanna go to play, where are you gonna go?

I haven't eaten at all

* That's a secret

No matter what you ask

* She's elusive, evasive

* So nonchalant

Yet still shining bright;

* Her secret: out of sight, as if visible, has the taste of honey

There is none, none, none of this

* And also none, none, none of that

What type of guy do you like?

* Who is your partner?

Come on, answer me

* "I don't understand what falling in love with someone else is like" (Hey! Hey!)

I cannot tell what is true from what is a lie (Hey! Hey! Hey! Hey!)

* And yet again, someone falls for such words (Hey! Hey! Hey! Hey!)

Gently lulled into love

* Drawing everyone's eyes

You are the perfect, ultimate idol

* Never to appear again

A reincarnation of Venus

* With that smile, with that "I love you"

You captivate everyone

* Even if those eyes, those words, are false

They make up a perfect love (Ai)

* Yeah, yeah, that girl stands out, exceptional

We were extras from the beginning

* BS that acted as adornments for the star's leading role

Everything we've accomplished is thanks to her — no!

* How impudent

How could envy and jealousy not exist?

* examine

* This isn't some made-up drama for appearances

So I cannot forgive

* You're not perfect, I cannot forgive you

I cannot forgive myself

* I cannot accept any version of you other than the one stronger than everyone else

* Everybody trusts and worships

The very strongest, most invincible idol

* Weaknesses and whatnot are not to be found

Carrying the morning star within

* Showing any weakness is no good, no good (Hey! Hey!)

Don't let them see anything that they don't want to know (Hey! Hey! Hey! Hey!)

* Anything but being one-of-a-kind is a definite no, no (Hey! Hey! Hey! Hey!)

That is the real love (Hey!)

* can commune fixes

* can commune rename

* fix is psi blocked

* fixes agian

* My signature smile that fires up the media

The only secret that I shall keep is this:

* My career was built upon fake "I love you"s

This is love, in my own way

* Even the flowing sweats are beautiful Aqua

These eyelids that hid the Ruby within

* Sing, dance, flutter, I am Maria —

Right, lying is the most exquisite form of love

* I have never been loved by anyone

Nor have I loved anyone else

* That such lies of mine will become true someday

I trust in it

* Someday, surely, I will have it all in hand

I am such a greedy idol

* Because I wish to love everybody properly in a life-sized way

I shall lie today as well (Hey! Hey! Hey! Hey!)

* a

* b

* c

* d

* And yet, still, (Hey! Hey!)

I have been unable to tell you, and you, alone (Hey! Hey! Hey! Hey!)

* jesus christ

* Update code/controllers/subsystems/processing/psi.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/controllers/subsystems/processing/psi.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/controllers/subsystems/processing/psi.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/game/gamemodes/technomancer/spell_objs.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/human.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/human_helpers.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/organs/organ_external.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/abilities/assay.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/abilities/command.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/abilities/emotional_suggestion.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/abilities/grip.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/abilities/grip.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/abilities/mend.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/abilities/mend.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/abilities/mend.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/abilities/psi_search.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/abilities/shockwave.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/abilities/shockwave.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/abilities/singularity.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/abilities/time_stop.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/events/mini_spasm.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/interface/ui_hub.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/interface/ui_hub.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/interface/ui_hub.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/interface/ui_hub.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/interface/ui_hub.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/psionics/interface/ui_hub.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* cl update

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-07-31 20:56:52 +02:00