Commit Graph

178 Commits

Author SHA1 Message Date
Wowzewow (Wezzy)
186e3a9547 Assorted Bug Fixes (#17399) 2023-09-22 20:10:02 +00:00
Cody Brittain
fb63881dc0 Enabled the SCC CCIA roles, and renamed the FIB to the BSSB (#16726)
* Enabled the SCC CCIA roles, and renamed the FIB to the BSSB

Fix incorrect outfit name

* Allowed BSSB Agents to be tajaran, unathi, and skrell; allowed BSSB Senior Agents to be skrell. This aligns with current lore.

* Add BSSB badges (sprites by whitewolftamer)

* CL

* New BSSB jacket sprites, and assorted fixes

* Added CL entry

* Update code/datums/outfits/event/outfit_nanotrasen.dm
2023-09-13 14:06:50 +00:00
Wowzewow (Wezzy)
462115b501 The Pumped Up Kicks Update (#16265)
* The Pumped Up Kicks Update

Shoes. New shoes. Look at them.

* WELCOME TO THE UNDERGROUND

* for the love of crust

* turns out a var already existed for that but was never implemented ffs

* face it you're never going to make it

* these are winter boots

* removes Paradox's Thinly Veiled Fetish

* shiit

* Apply suggestions from code review

* Update code/modules/clothing/shoes/oxfords.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* oops

* fuck this file

* nice balls, bro

* check out how hard i can pee

* pissing on the moon

* caligaeae

* pee pee poo poo man

* fixes

* damn you

* merge fixes

* knees more

* damn you merge conflict

* fix

* fixes 2

* riding boots

* truly, this fixes things

* dammit ctrl s

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-09-13 11:29:03 +00:00
Cody Brittain
69fbefa17c Added a uniform for Einstein Engines (#17202)
* Added a uniform for Einstein Engines

* Fix indenting
2023-09-07 20:45:18 +00:00
Doxxmedearly
ece73e279b Alt-title access fixes (#17091)
* Alt-title access fixes

* Makes life harder for learners
2023-08-20 14:14:59 +00:00
io
266634077e Adds New SCC ERT Hardsuits for Admin & Event Use (#17073)
* add new scc ert hardsuits

* changelog

* modifies the .dme

* restricts hardsuits to human only

* edit the changelog

* edit the changelog, part 2

* change dmi paths and hardsuit names
2023-08-19 20:32:35 +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
Matt Atlas
87f637564f Revert "Psionics Rework: Kyoushiki Murasaki (#16805)" (#16948)
This reverts commit 27c40bdaf6.
2023-07-31 01:51:40 +00:00
Matt Atlas
27c40bdaf6 Psionics Rework: Kyoushiki Murasaki (#16805)
* 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-30 21:56:12 +00:00
kyres1
ea40046836 Loadout Hats - assorted additions and condensing (#16476)
* part 2

* progress

* hats

* HATTTS

* fixes a test + adds a pixel to the fedora
2023-07-29 13:04:03 +00:00
RustingWithYou
57fd0eaf76 Vaurca filters now work as described (#16590)
* vaurca filters are now gas masks

* changelog

* fixes mapped-in vaurca masks
2023-07-13 13:32:44 +00:00
Werner
3742231bc2 Major UT Overhaul (#16544)
* Removes old UT definition files (drone/travis)
* Adds concurrency definitions to the workflows
* Changes our workflows to be more in line with what /tg does
* Adds a workflow to build/commit TGUI
* Adds a workflow to build/commit changelogs

Add python version to dependencies.sh
Fix dme errors
Removes a bunch of not included files
Cache Opendream and add directory to check_grep.py

Co-authored-by: Werner <Arrow768@users.noreply.github.com>
2023-06-27 16:44:16 +02:00
Matt Atlas
316a80c231 Splits telecrystals into bluecrystals and telecrystals. (#16380)
* bluecrystals 1

* Splits telecrystals into bluecrystals and telecrystals.

* fixes

* dans ma tete ce n'est pas evident

* c'est toujours trop beau pour etre vrai

* on ne peut toucher le ciel des doigts

* thanks lily

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-06-18 12:43:49 +00:00
Wildkins
209a0a2e0f Cleaning up some runtimes (#16027) 2023-03-13 19:22:43 +00:00
Geeves
243da52b21 Sleek Wristbound Radio (#15918) 2023-03-06 13:01:49 +00:00
SleepyGemmy
de47686ec0 Overalls and Shorts Tweaks (#14987) 2023-02-02 15:01:19 -03:00
Matt Atlas
dd482c63af Update the codebase to 515. (#15553)
* Update the codebase to 515.

* edit that

* WHOOPS

* maor

* maybe works

* libcall and shit

* do that too

* remove that

* auxtools isnt updated so get rid of it

* actually remove auxtools lol

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-01-23 21:21:37 +01:00
Matt Atlas
ceeea46b1d Dominian greatcoats and coats additions. (#15549) 2023-01-23 20:50:53 +01:00
Geeves
f88e0e1b37 Spawning Tweaks and Fixes (#15308) 2022-12-16 12:11:42 +01:00
SleepyGemmy
38c261b600 Tweaks Examination Code (#14843) 2022-11-18 12:47:46 +01:00
SleepyGemmy
8ece1d8926 Fixes Bag Masks (#14981) 2022-11-13 12:56:54 +01:00
Wowzewow (Wezzy)
009b34de5f Backpack strap and inhand fixes (#14968) 2022-10-23 10:45:14 +02:00
Wowzewow (Wezzy)
a029656863 New backbag sprites and a lot more! (#14531) 2022-10-22 19:54:10 +02:00
Wowzewow (Wezzy)
d4d89e4513 Portable Memory Wiper. (#14696) 2022-08-29 22:02:54 +02:00
Matt Atlas
ce0501fc76 Revert "Jackboot and black glove resprite" (#14647) 2022-08-21 01:57:32 +02:00
Wowzewow (Wezzy)
5faf6b6e7a Jackboot and black glove resprite (#14564) 2022-08-17 18:58:43 +02:00
SleepyGemmy
55973cec38 Fixes NanoTrasen Typos (#14540) 2022-08-06 16:46:47 +02:00
TheDanseMacabre
ed43343dcc Various removals. (#14135) 2022-07-17 22:12:11 +02:00
Wowzewow (Wezzy)
2bec6f1762 Fixes #14411 (#14412) 2022-07-10 18:31:18 +02:00
Wildkins
bf81e76592 Macro-ize some helpers, character preview optimize (#14354) 2022-07-01 12:40:30 +02:00
TheDanseMacabre
4eb931cb81 Solarian Warlord Armor (#14359) 2022-07-01 12:40:24 +02:00
TheDanseMacabre
278f0d23b9 Antag Rebalances, Armory Restock (#13830) 2022-06-29 20:45:58 +02:00
Wowzewow (Wezzy)
176d2cfef0 Security Uniform Tweaks (#14229) 2022-06-20 18:02:16 +02:00
WickedCybs
417d9b8102 Raiders Spawn With Sunglasses (#14279) 2022-06-20 17:47:22 +02:00
Wowzewow (Wezzy)
2e01e9c72b Hazardous materials (#14219) 2022-06-12 22:47:15 +02:00
Wowzewow (Wezzy)
46708ab624 Fixes some Sol uniforms having their uniforms being unable to be rolled (#14243) 2022-06-09 12:03:20 +02:00
VisVirific
2c562a0a78 Ports and Tweaks CMSS13's New Colored Jumpsuit Sprites (#14174)
* Organizes the color pathing and code. Removes Psych and Rainbow jumpsuits.

* Sprites in. Adjusted Bulwark Jumpsuits. Changelog

* Gem's Review Addressed (forgotten punctuations and removing the adjectives from them as well)
2022-06-05 00:19:35 +02:00
WickedCybs
1b5375e53c New and Improved Survival Box for Antags, Admins, CCIA and Engineering (#14106) 2022-05-29 01:29:57 +02:00
VisVirific
7b7ecb860b Eridani Loadout Items Re-Additions (#13977) 2022-05-23 18:34:05 +02:00
mikomyazaki
dae76e0558 Life improvements: Part 1 (#13912) 2022-05-18 14:22:43 +02:00
Wowzewow (Wezzy)
1f5bbf4145 NBT Uniform Fixes (#13936) 2022-05-14 11:52:50 +02:00
Wowzewow (Wezzy)
3e8f9e0901 The Uniformity : The Confluence of Conformity (#13773) 2022-05-13 12:08:50 +02:00
WickedCybs
d29784f6aa Total Autodrobe Removal + Spawn locker buffs (#13724) 2022-05-06 13:57:00 +02:00
alberyk
12a70b50b7 Merge branch 'master' into updates_the_nbt
# Conflicts:
#	code/__defines/misc.dm
#	code/game/machinery/machinery.dm
#	maps/_common/mapsystem/map.dm
2022-02-19 10:26:35 -03:00
Casper3667
aa95995ef0 Fixes pda spawning as unknown (#13176) 2022-02-15 23:23:35 +01:00
alberyk
a61a4b7e2c Merge branch 'master' into fixes_compile 2022-02-04 14:22:38 -03:00
BLUNTFORCE420
dff6489eeb Resprites the 10mm Machine Pistol (#13053) 2022-02-04 12:21:17 +01:00
Wowzewow (Wezzy)
23fe07d0d9 Funny PDA Descriptions (#12873) 2022-02-02 17:38:17 +01:00
alberyk
1dc3bb2dd8 Merge branch 'master' into final_shuttle_touches_and_stuff 2022-01-14 21:04:38 -03:00
Casper3667
4bc3466389 fixes the unathi mantle path (#12891) 2022-01-07 19:07:34 +01:00