Commit Graph
21 Commits
Author SHA1 Message Date
shayoki 97a15ec8f8 initial 2026-06-03 01:25:02 -05:00
RoxyandGitHub 0d4b523248 Fix runtimes in combat indicator (#3665)
## About The Pull Request

Combat indicator code incorrectly treats
`COMSIG_LIVING_STATUS_UNCONSCIOUS` being sent when the mob isn't
unconscious as a bug and throws a stack trace, in reality that signal is
sent whenever the unconscious status of the mob is adjusted at all, like
when a negative amount is applied to wake someone up. Change the logic
to return if the mob isn't actually going unconscious

## Why It's Good For The Game

several dozen meaningless runtimes gone

## Proof Of Testing

Imagine an empty runtime list

## Changelog

Nothing player facing
2025-04-29 00:04:47 -07:00
5c50d1f9f5 Small batch port (#28314)
* Early ports modular lasers from Nova, they can talk to you! (#1066)

Description was copy pasted from Nova
[PR#561](https://github.com/NovaSector/NovaSector/pull/561)

![image](https://github.com/Bubberstation/Bubberstation/assets/81807356/aff45752-00bd-4a96-8748-35b37544a1fc)

These new weapons, the modular energy rifles and carbines, have many
unique functions.

Each of the two weapon types has its own collection of modes, each
mostly unique from the other version of the gun.

For the long rifle, these include:

Two-burst laser mode
Sniper mode with massive scope
Windup autofire disabler machinegun
Plasma grenade launcher
Plasma shotgun
And for the short carbine these include:

Hellfire laser mode
Its A Sword Now
Trickshot disabler mode
Plasma flare launcher
Micro-shotgun
Each of the two can switch between these modes with a short delay and
animation, though all modes run off of the same battery. Luckily, the
battery does self-recharge, though at a very slow rate.

But there's something even better for these weapons, they talk to you.
Each mode and each variant of energy gun has its own little personality
with it, and it'll talk to you when certain things happen. For example,
switching modes, running out of power, picking them up, and more!

While this can be disabled, that would make the persona in the gun quite
sad. You wouldn't want to do that, would you?

But, and I swear this is the last thing this time. Each of these guns
has a built in soulcatcher (you can access it with alt-click!) for
giving your weapons some REAL personality. And now you observer mains
can finally live out your dreams of being someone's weapon!

Im going to replace ERT energy weapons with these guns, author of this
weapons originaly replaced MCR's with these. Perhps if people will want
to, I can replace mcrs with these....

<details>

![image](https://github.com/Bubberstation/Bubberstation/assets/81807356/146723e4-475a-4f7a-b5e5-3d6c6568753f)

https://github.com/Bubberstation/Bubberstation/assets/81807356/a6a8c8a2-f3ee-4b30-97e2-580e42f2ae56

https://github.com/Bubberstation/Bubberstation/assets/81807356/c560e26b-5d27-493a-b067-01957e4bb81a

https://github.com/Bubberstation/Bubberstation/assets/81807356/7a36eed6-45a7-42b4-af56-cb6022f15204

</details>

🆑 Paxilmaniac
add: A pair of new energy weapons has been added. Coming in both long
and short versions, these persona-enabled weapons have many different
modes they can rapidly reconfigure themselves between to fit whatever
the operator's preferences may be.
/🆑

---------

Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>

* fex

* yeah

* [PORT] [SEMI-MODULAR] [100% FREE LAG] Chat Colors (#157)

* Port Chat Colors / effigyse

* Im crazy

* Thenk u mal

* Adds global chat color list

* Apply suggestions from code review

* extra line

* Makes this happen when you spawn as opposed to when you change prefs

Less extra list entries that way

* Adds cyborg support

I think cyborg brain prefs were not working previously, either. Fixes that...

* I forgot about the AI

* Apply suggestions from code review

* Makes user's prefs apply to the TTS device that they are using

---------

Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>

* e

* https://github.com/NovaSector/NovaSector/pull/2234

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/26072

* Update tgstation.dme

* https://github.com/NovaSector/NovaSector/pull/323

* 0

* Update emote.dm

---------

Co-authored-by: Erol509 <81807356+Erol509@users.noreply.github.com>
Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: Name <w4rd3nn@gmail.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
2024-06-22 22:42:43 +01:00
78331453b1 More Ports (#26119)
* Makes SMES deconstructible normally again | Adds pre-charged variants of the stationary batteries for mappers (#363)

byeah

* Fixing a potential issue with liquid turfs (#356)

* Fixes active turfs being added to the liquids subsystem while it is disabled

* Update liquid_controller.dm

* Don't think we need or want to be doing this

* cuffbusters - wirecutter-mode powered drivers can snip cablecuffs/zipties (#368)

cuffbustas

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>

* Makes deployable thermomachines correctly update their pipe direction when placed down (#369)

yeah

* [MODULAR] Fixes borg temp ftext overlay + popout window (#396)

* dasfg

* Update modular_nova/modules/customization/modules/mob/living/silicon/topic.dm

* ok sure

* Update update_icons.dm

---------

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

---------

Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
Co-authored-by: Hatterhat <31829017+Hatterhat@users.noreply.github.com>
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
Co-authored-by: nikothedude <59709059+nikothedude@users.noreply.github.com>
2024-01-14 22:02:33 -05:00
BloopandGitHub cd752b3232 [MODULAR] Fixes combat indicator not updating properly for cyborgs (#19245)
Fixes combat indicator not updating properly for borgs
2023-02-10 14:15:58 +00:00
b505119642 Surrender while in Soft Crit (#17916)
* Update combat_indicator.dm

- allows SOFT_CRIT for *surrender
- adds an alt message should the user already be down

* it broke

* Update combat_indicator.dm

* I think it worked?

Maybe... Probably.

* Update modular_skyrat/modules/indicators/code/combat_indicator.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* adds custom check for body position

Thank you tf-4 for your witchcraft

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-12-14 13:14:14 +00:00
SkyratBotandGitHub b9b6a803b0 [MIRROR] Throws a bunch of parenthesis around to ensure dear Aunt Sally is always properly excused. [MDB IGNORE] (#17654) 2022-11-22 19:44:59 -08:00
07071eef48 [BASICALLY MODULAR] Runs grep checks on modular_skyrat and fixes all issues (#17469)
* Runs grep checks on modular_skyrat and fixes all issues

* feather

* Update modular_skyrat/modules/verbs/code/say.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* loadout descs

* fixes

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
2022-11-16 11:08:41 -05:00
f7c26bbf25 515 Compat (#17465)
* ONLY SKYRAT CHANGES

* ACTUALLY SKYRAT CHANGES

* yolo, revert later

* Update alternate_byond_versions.txt

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
2022-11-15 06:59:06 +00:00
HigginandGitHub a2bf605e32 [MODULAR] Makes CI sound shorter range. (#15198)
Makes CI sound shorter range.
2022-07-28 11:45:39 -07:00
7a653adfbb [MIRROR] TGUI Say: Upgrades chat input with modern features [MDB IGNORE] (#14375)
* TGUI Say: Upgrades chat input with modern features

* yes

Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-06-17 02:12:42 +01:00
ghost sheepandGitHub 7d44f3f51d [SemiModular] Raises the layer of the chat indicator (#13297)
* [Modular] Raises the layer of the chat indicator

* Non-modular edit to layers.dm
2022-05-05 00:52:59 +01:00
GoldenAlpharexandGitHub 8faebbddfd Ensures that a few sounds that shouldn't go through walls, don't go through walls (#12995) 2022-04-22 15:17:35 +01:00
ZonespaceandGitHub 8c96cc6caf [MODULAR] Emote typing indicators are now blue (#11936)
* woo

* good point
2022-03-09 20:07:08 -05:00
26de81a8c1 [MIRROR] Removes useless status effect path defines. [MDB IGNORE] (#11143)
* Removes useless status effect path defines.

* Removes useless status effect path defines.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-01-30 15:56:13 +00:00
nikothedudeandGitHub e454b55092 [SEMI-MODULAR] Lets mechs use CI, also adds a seperate emote_flick proc to allow emote_flick to be used on objects. (#9922)
* WE DID IT BOYS WOOOO

* agony

* only pushing this to put it onlinme

* needs updating

* that was a terrible idea

* code cleanup time

* comments

* boop

* savanna compatability

* broken, dont merge

* its not broken!

* (why did i not do t his initially)

* FULL FUNCTIONALITY

* nothing to see here, officer

* i have no fucking idea of what im doing?

* i am so confused

* i really fucking hope i didnt just do a weird thing

* moves to vehicle/sealed

* code improvement

* documentation,,,,,,,,,

* wdwdwdwd

* oopsie woopsie

* DOCUMENTATION.

* h

* d

* goddamn it

* you know you look at your code and you realize "wow im a dumbass" every single time

* FUCK
2022-01-09 15:50:51 -05:00
ZephyrandGitHub 6a0b62c8ee CI Fix (It doesn't randomly disappear anymore) (#9872)
* make this handled by the actual overlay system

* eternal agony
2021-12-13 10:49:45 +00:00
Seris02andGitHub dd08728166 runtime be gone (#8743) 2021-10-10 23:49:43 -04:00
68e84c432e Skyrat Prefs Menu: Fixing everything to work correctly (#8350)
* Skyrat Prefs Menu: Fixing everything to work correctly

* whoops haha

* Examine menu!

* haha whoops

* Mutant Parts in tgui prefs

* fug

* LIMBS, MARKINGS, LANGUAGES

* EEEE FUCK

* Update tgui_prefs_migration.dm

* Update tgui_prefs_migration.dm

* FUCK

* Proper migration

* Update preferences.dm

* Final fixes for this shit

* Update LoadoutManager.js

* adds cursed shit

* e

* Update preferences.dm

* fixes examine panel

* adds // SKYRAT EDIT to bullshit

* sabshesgawgzxghsv

* wargesthgeargfea

* stegresgdytfrw

* EEE

* Update species_features.tsx

* EEE

* Update cursed_shit.tsx

* fixed taurs

* body size is now a 0.01 step

* Fixes some bugs

* Some required changes.

* Update examine.dm

* actually nekked

* Update code/modules/client/preferences/middleware/jobs.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update code/modules/client/preferences/middleware/limbs_and_markings.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update code/modules/client/preferences/middleware/limbs_and_markings.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update code/modules/client/preferences/middleware/limbs_and_markings.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/master_files/code/modules/client/preferences/erp_preferences.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/loadouts/loadout_ui/loadout_manager.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/skyrat/species_features.tsx

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* More fixes

* Donator items no show

* EEE

* fixes rapier sheaths

* gender =/= body type

* Loadout fixes

* Skintone

* Update skin_tone.dm

* Slick it up

* Update loadout_manager.dm

* Fixes typing indicator

* SSD indicator fixes

* fixes

* oops

* Fix this.

* Fixing the Occupations Menu

* Fixing NT Rep's alt-titles

* Update tgui/packages/tgui/interfaces/PreferencesMenu/jobs/jobs/janitor.ts

Co-authored-by: death and coding <58394696+thestubborn@users.noreply.github.com>

* Update code/controllers/subsystem/language.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update tgui/packages/tgui/interfaces/PreferencesMenu/jobs/jobs/research_director.ts

Co-authored-by: death and coding <58394696+thestubborn@users.noreply.github.com>

Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: death and coding <58394696+thestubborn@users.noreply.github.com>
2021-09-29 15:24:30 +01:00
84a4c071ef Makes CI more clearly an IC indication of combat (#7712)
* Update combat_indicator.dm

* Update combat_indicator.dm

* Update modular_skyrat/modules/indicators/code/combat_indicator.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update modular_skyrat/modules/indicators/code/combat_indicator.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update modular_skyrat/modules/indicators/code/combat_indicator.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update modular_skyrat/modules/indicators/code/combat_indicator.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update modular_skyrat/modules/indicators/code/combat_indicator.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update combat_indicator.dm

* Update combat_indicator.dm

* Update modular_skyrat/modules/indicators/code/combat_indicator.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-08-24 12:35:36 -04:00
FlamingLilyandGitHub fb76d7cac8 [MOSTLY-MODULAR] Snappy Surrendering and Indicator Code Cleanup. (#6955)
* sentience indicator

* un-sentience the sentience indicator

* make surrendering important again

* why did i modularise click()

* Update modular_skyrat/modules/indicators/code/combat_indicator.dm

* Update modular_skyrat/modules/indicators/code/combat_indicator.dm
2021-07-20 15:03:17 +02:00