3600 Commits
Author SHA1 Message Date
Wowzewow (Wezzy)andGitHub 9c69a6e884 Sprite and Bug Fixes Again Again (#17477)
* Sprite and Bug Fixes Again Again

Fixes #17465
Fixes #17462
Fixes #17456
Fixes #17450
Fixes #17458
Fixes #17422

* changelog
2023-09-29 14:01:43 +00:00
GeevesandGitHub 149f6205c0 Mining Coin Tweak (#17441) 2023-09-28 19:38:14 +00:00
Cody BrittainandGitHub 0a3dac31e0 Refactored do_after to use a flag-based system for options (#17127)
* Refactored do_after to use a flag-based system for options

* More flags

* Ditto

* Use the HAS_FLAG macro

* do_after pass

* Fix burning paper code

* Resolve issues from Fluffy's code reviews

* .
2023-09-27 12:17:14 +00:00
Wowzewow (Wezzy)andGitHub fd26ff32e2 Fixes Examine Crashes (#17430)
* Fixes Examine Crashes

* fukken indentations
2023-09-27 10:22:04 +00:00
0db705d678 Implant Improvements (#16905)
* Modernize and improve implant code

* Lint fix

* Fix initialize hint in implant cases

* fix tabulations

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-09-24 22:41:02 +00:00
Wowzewow (Wezzy)andGitHub 086776cb83 New Cell Charger, Suit Storage, Drying Rack and Smartfridge Sprites (#17390)
* New Cell Charger, Suit Storage and Smartfridge Sprites

title, ported from /tg/

* Update wezzy-RandomBetterSprats.yml

* oops

* merge conflict

* konyang shit
2023-09-24 22:14:10 +00:00
Wowzewow (Wezzy)andGitHub faca6da739 The Food Sortening, Extra Pain-In-My-Ass Edition (#17393)
* The Food Sortening, Extra Pain-In-My-Ass Edition

Sorts all food sprites and cuts down the MONOLITH snacks.dm and food.dmi. This was an absolute pain in my ass. No front-facing changes.

Planning to add more shit down the line. Makes everyone's lives easier.

* changelol

* finally

* inhands

* merge conflict

* this really "ticked" me off HAHAHAHAHS

* fixes

* make megalinter happy
2023-09-24 22:13:15 +00:00
FluffyGitHubFluffyGhost <FluffyGhost>
9d2f950e8e Fixed ZASDBG, Added ZAS logging subsystem, Removed FIREDBG and consolidated it under ZASDBG (#17386)
* Atomization

* asfsa

* sdaf

* sdfas

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-09-23 19:25:13 +00:00
f18d4128ad [WORK IN PROGRESS] Konyang and Point Verdant (#16714)
* starting point verdant

* major progress

* PAIN

* test

* zlevels AAGHHH OH NO

* im scream

* kawnyang

* dam thats good

* Biff Largehuge

* Look Gordon, ropes!

* wawagh

* rgrhgrhrgrh

* Gordon, you're alive! Thank God for that hazard suit.

* help

* frownie face

* wegh

* Gordon! Get away from the beams!

* Good morning, Gordon.

* Signs

* fix multiple proc definition

* initial ambience

* gay rain

* beach and some pebbles literally

* fixing conflicts aUGH

* generation

* guh?

* sewers and beach additions

* maping

* map

* womp womp

* landing zone

* fixing missing shit

* buddha

* ass

* major map updates

* implemented key doors, fixed baloon alert and tasks

* mineral color, adds ozone layer

* real fake walls

* vending subtypes for the regional market

* mooooar

* minimart pt 1

* haneunim skybox

* station mapping progress

* minimart and roboclinic

* offices progress

* bar work

* size change, some polishing of the office + police station

* map size update. Also a fuckton

* tunnels

* more work

* Why doesnt the map initialize

* broke shit

* fixing point verdant spawning, also ocean landing zone

* finishing some buildings

* mapping, village, not finished

* village, main road

* village stuff

* village stuff

* village stuff

* village stuff

* anchoring

* village stuff

* random space tiles fix

* random space tiles fix

* bin fixes

* missing initialize hint on new floors

* fix open space on basement level

* idk

* missing initialize hint

* tests again please

* tests rerun please

* oven/small be gone

* remove shuttle landmarks idk

* bad stairs fix maybe

* fix missing open space above stairs

* tests rerun please

* CircularRandomTurfAround fix

* spaces to tabs

---------

Co-authored-by: atteria <tarkona@protonmail.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com>
2023-09-23 21:23:38 +02:00
FluffyandGitHub 955102ef4d More spacemandmm harnessing against bad code (#17376)
* sdfaf

* ssdasd

* dfsd

* try to apply a linter to spot violations of editorconfig

* sfdas

* asf

* sadfas

* sfasf

* asfsda

* sdaf

* sfsad

* totally not for testing

* aaaaaaaaaaaaaaa

* asfsadf

* saf

* sdfaf
2023-09-23 13:46:26 +00:00
Wowzewow (Wezzy)andGitHub 186e3a9547 Assorted Bug Fixes (#17399) 2023-09-22 20:10:02 +00:00
AlberykandGitHub a6db489e71 Tajara religious loadout fixes (#17395)
* Loadout fixes

* changelog
2023-09-22 11:01:49 +00:00
57ad3201e0 Tajara loadout expansion: far from home edition (#17270)
* A lot of tajaran stuff

* Changelog

* moved this for better organization

* god fix

* Update code/modules/clothing/rings/xeno/tajara.dm

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

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

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

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

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

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

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

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

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

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

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

* Flame source

* imrpoper

* passport

* matt fixes

* Fixes conflict

* fixes

* kitchen

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-09-21 10:28:15 +00:00
1b51600ca6 Kitchen Resprites (#17311)
* Kitchen Resprites

* for ata

* Update code/modules/cooking/machinery/cooking_machines/container.dm

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

* Update code/modules/cooking/machinery/cooking_machines/container.dm

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

* Update code/modules/cooking/machinery/cooking_machines/container.dm

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

* Update code/modules/cooking/machinery/cooking_machines/container.dm

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

* admiral ackbar cereal

* walter j hartwell

* for real?

* hank schrader

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-09-19 09:58:22 +00:00
Wowzewow (Wezzy)andGitHub a831982d22 Cigarettes Glitch Fix (#17361)
Fixes #17280
2023-09-18 20:38:15 +00:00
GeevesandGitHub f7ae74efca More Ta Fixes (#17350)
* More Ta Fixes

* wing bugginess fix

* cl

* floating chat offset
2023-09-16 10:45:24 +00:00
652a3d02d4 Adds Storage Container Animations (#17329)
* Much ado about the Bagginses

* god i hate manually mapped shit

* Update code/game/objects/items/weapons/storage/storage.dm

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

* fixes

* yes

* Update code/game/objects/items/weapons/storage/bags.dm

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

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-09-16 10:33:52 +00:00
f5197ee13a Wallets can now hold the boxes for rollable cigarette components. (#17323)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-09-14 21:51:29 +00:00
Cody BrittainandGitHub 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
3daaff3805 Hive Flag Tunnel Cloaks (#17287)
* cloaks

* certified \improper moment

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

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-09-12 10:38:35 +00:00
ce5ac79e3c Split examine verb and function, and improve it (#17251)
* Split examine verb and function, and include adjacency and distance checking in examine function

* Fix various issues

* Update code/modules/mob/examinations.dm

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

* Add required define vars

* Update code/game/objects/items/stacks/wrap.dm

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

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-09-09 08:07:36 +00:00
48012a1930 Vaurca Integrated Magclaws (#16886)
* bulwark sprites

* augment claws

* changelog

* job restrictions

* Update code/game/objects/items/weapons/vaurca_items.dm

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

* what i get for copypasting aug code

* i forgor

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

---------

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-09-07 21:04:10 +00:00
c0135c8df5 大佬,來抽煙 (Yakuza Smoking Mechanics) (#17067)
* 大佬,來抽煙 (Yakuza Smoking Mechanics)

  - rscadd: "You can now offer someone a smoke directly from the packet. Just target the mouth area with an open cigarette packet, like you would yourself."
  - rscadd: "You can also offer to light someone else's cigarettes."

* Update code/game/objects/items/weapons/storage/fancy.dm

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

* fixes

* use_check

* oops

---------

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2023-09-07 15:44:14 +00:00
cc8eab09ef Reagent Containers : The 3/4thening & Contained Spritening (and other related food things) (#17231)
* food and drink

* sabrage

* kanpai and blasted on grain alcohol

* beakers

* Update code/modules/reagents/reagent_containers/food/cans.dm

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

* Update code/modules/reagents/reagent_containers/food/cans.dm

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

* Update code/modules/reagents/reagent_containers/food/cans.dm

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

* Update code/modules/reagents/reagent_containers/food/cans.dm

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

* Update code/modules/reagents/reagent_containers/food/cans.dm

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

* Update code/modules/reagents/reagent_containers/food/drinks/bottle.dm

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

* Update code/modules/reagents/reagent_containers/food/drinks/bottle.dm

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

* changelog

* the contained sprite-ening....

* deletes old file

* teapot

* aaaaahhhh

* AAAGH INHANDS

* volume = 30

* fixes invalid icon state

* is this really that fucking esoteric

* Revert "is this really that fucking esoteric"

This reverts commit 5b238c7821.

* this should fix it maybe

* fixes 2

* the simple solution

* skibidi toilet

* god dammit

* jyalra

* redundancy

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-09-06 18:54:20 +00:00
FluffyGitHubFluffyGhost <FluffyGhost>
adfa4d8410 Implant refdrop (#17248)
* Atomization

* sdf

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-09-05 21:50:48 +00:00
7e41645c7a Adds TCAF Equipment and Armor (#17162)
* Adds TCAF Equipment and Armor

* Update code/game/objects/items/weapons/storage/backpack.dm

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

* Update code/modules/clothing/head/berets.dm

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

* Update code/modules/clothing/head/berets.dm

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

* Update code/modules/clothing/head/berets.dm

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

* Update code/modules/clothing/under/miscellaneous.dm

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

* Edited accidental changes to the Great Laser Nerf

* Update html/changelogs/tcaf-additions.yml

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

* Update code/modules/clothing/under/miscellaneous.dm

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

* Update code/game/objects/items/weapons/storage/backpack.dm

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

* Update code/modules/clothing/gloves/miscellaneous.dm

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

* Update code/modules/clothing/suits/modular_armor.dm

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

* Update code/modules/clothing/suits/modular_armor.dm

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

* Update code/modules/clothing/suits/modular_armor.dm

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

* Update code/modules/clothing/under/accessories/armor.dm

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

* Update code/modules/clothing/under/accessories/armor.dm

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

* Update code/modules/clothing/under/accessories/armor.dm

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

* Update code/modules/clothing/suits/modular_armor.dm

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

* Update code/modules/clothing/suits/modular_armor.dm

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

* Update code/modules/clothing/suits/modular_armor.dm

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

* Update code/modules/clothing/suits/modular_armor.dm

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

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-09-04 18:44:12 +00:00
Cody BrittainandGitHub 9a6edb999f Cleanup and expand suppressors (#17173)
* Cleanup and expand suppressors

Suicide uses suppressed sounds too

Fix CL

Added the suppressor to the antagonist uplink

Fix CL escape characters

Fix random list

Resolve issues from code review

Split the suppressor into its own file

* Bayonets and ammo displays now add their weight to their attached weapon

* Balloon alerts for weapon mods

* Fix lint
2023-09-04 08:22:14 +00:00
Cody BrittainandGitHub 7cd14bb733 Changed the uplink spacesuit into a standard spacesuit with extra armor. (#17154) 2023-08-30 22:36:53 +00:00
Cody BrittainandGitHub 8c2c1c08f1 Frontier Cowboys now receive a lever action rifle (#17156)
* Frontier Cowboys now receive a level action rifle

* Icon and sounds for the Lever Action

* CL

* Attribution

* Added updated sprites by suethecake

* Ensure internal consistency
2023-08-30 22:36:52 +00:00
FluffyandGitHub 1630bb819b Adjusted the santabag size to 200 (#17176) 2023-08-30 22:36:29 +00:00
FluffyGitHubFluffyGhost <FluffyGhost>SleepyGemmy
83487649de The RIG jetpack and manouvering module can now delete correctly (#17180)
* Atomization

* cl

* Stray Newline

---------

Co-authored-by: FluffyGhost <FluffyGhost>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-08-30 22:36:24 +00:00
1ab598e051 Combat QoL (#17119)
* Combat QoL

* stuff

* Update html/changelogs/geeves-combat_qol.yml

---------

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2023-08-24 19:30:07 +00:00
07233cb624 Replaces the TCFL pamphlet sprite (#17126)
* il vento d'oro

* JOJO

* cl

* Update code/game/objects/items/weapons/manuals.dm

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

---------

Co-authored-by: KingOfThePing <cb.back@gmx.de>
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-08-24 19:02:12 +00:00
ioandGitHub 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
DoxxmedearlyandGitHub 1dca31c90e Fixes more uninteractable effects (#17038) 2023-08-07 22:42:58 +00:00
FluffyandGitHub 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
SparkyandGitHub 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
GeevesandGitHub d0488e5068 Viscerator Grenade Tweaks (#16913) 2023-08-02 13:29:07 +00:00
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
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 AtlasandGitHub 87f637564f Revert "Psionics Rework: Kyoushiki Murasaki (#16805)" (#16948)
This reverts commit 27c40bdaf6.
2023-07-31 01:51:40 +00:00
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
DreamySkrellGitHubDreamySkrell <>
cc41bb76fc Idris cafe (#16884)
* freezer, teal decals

* mappin

* a

* cafesign

* a

* coffeemenu

* pumpkinspice

* coffeemenu

* pspice in condi box

* mapping

* a

* a

* a

* takeaway cup

* chocolate syrup

* mappp

* table

* syrup icon

* syrup reagentfillings icon

* takeaway cup volume

* syrup bottles

* freez

* condiment box

* map

* c

* a

* firealarm

* oops

* Update DreamySkrell-idris-cafe-0.yml

* post merge fix?

---------

Co-authored-by: DreamySkrell <>
2023-07-30 18:31:18 +00:00
juniperandGitHub d5bee3c1dc emergency filter port fix (#16847)
* story of the cen-tur-y

* emergency del macaco

* Delete crunchypretzels-bugmaks.yml

* yeah
2023-07-23 16:55:50 +00:00
juniperandGitHub 9f66972d0a story of the cen-tur-y (#16838) 2023-07-22 20:57:40 +00:00
DoxxmedearlyandGitHub 444cd21686 Fixes invisible lipstick inhands (#16811) 2023-07-21 20:38:35 +00:00
nautandGitHub 7276aedde8 New medkit and trauma pouch sprites (#16744)
* New first aid kit sprites

* Kit map changes

* Inhand sprites + combat kit correction

* changelog

* retcons

* Coding and description tweaks

* szsz

* New-new first aid kits

* removal

* handle removal
2023-07-19 14:29:19 +00:00
RustingWithYouandGitHub 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
nautandGitHub ef2d6ac23c Hypospray + surgical tools resprites (#16660)
* New surgical tools

* Inhand sprites

* Icon state fix for CMO hypo

* Spelling fixes

* Sprite updoots
2023-07-13 10:01:35 +00:00
GeevesandGitHub 7964478cd1 Lipstick Buff (#16584)
* Lipstick Buff

* cl
2023-07-02 09:52:36 +00:00