cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-16 04:34:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
107,156 Commits 63 Branches 14 Tags
fa5136cad80dccdcd87581056c60b51a872b9d07
Commit Graph

24 Commits

Author SHA1 Message Date
Pinta
fa5136cad8 [Like 99% Modular] Soulcatchers (#20576) 
* wew

* Update soulcatcher.dm

* Update soulcatcher.dm

* Update soulcatcher.dm

* Update soulcatcher.dm

* Update soulcatcher.dm

* file moving

* tgui

* tgui_work

* wew

* more tweaks

* more stuff

* fancy

* nifsoft

* mob

* whoopsie

* man

* mind transfer

* ooc and flavor text

* Update soulcatcher_component.dm

* Update soulcatcher_mob.dm

* persistence

* hud

* a little bit of admin logging, as a treat

* Update soulcatcher_component.dm

* Update devices.dmi

* research

* some things I missed.

* whooops

* Update soulcatcher_component.dm

* Update soulcatcher_items.dm

* Update soulcatcher_component.dm

* lore

* Update soulcatcher_component.dm

* Update soulcatcher.dm

* Apply suggestions from code review

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

* Update soulcatcher_items.dm

* Apply suggestions from code review

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

* Update soulcatcher_component.dm

* Update tgui/packages/tgui/interfaces/Soulcatcher.js

Co-authored-by: nikothedude <59709059+nikothedude@users.noreply.github.com>

* >w>

* moves the body component

* Update tgstation.dme

* renaming

* file move

* oh wow, I didn't need to make this non modular

* signals

* Update handheld_soulcatcher.dm

* more touches

* Update soulcatcher_mob.dm

* code suggestions

* Update handheld_soulcatcher.dm

* Update handheld_soulcatcher.dm

* Apply suggestions from code review

Co-authored-by: nikothedude <59709059+nikothedude@users.noreply.github.com>

* Update soulcatcher_component.dm

* a

* more signals :3

* This is a surprise tool that will be added back later.

* better UX

* Update soulcatcher.dm

* QoL

* Spamming reduction.

* Update nifs.dm

* Update handheld_soulcatcher.dm

* Update soulcatcher_component.dm

* Update soulcatcher_component.dm

* Update modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_component.dm

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

* Update soulcatcher_component.dm

* Update soulcatcher.dm

* no more empty bodies

* 1984

* whoopsie

* transfer fix

* Update mobs.dm

* more logging

* Update soulcatcher_component.dm

* QoL

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: nikothedude <59709059+nikothedude@users.noreply.github.com>
 2023-06-01 17:28:29 -04:00
Pinta
015e7af657 [NO GBP][MODULAR] Fixes NIFs not removing actions upon removal (#20888) 
Update nifs.dm
 2023-05-02 15:29:07 -04:00
Pinta
d9f4bd57d9 [MODULAR] NIFSofts now display Font Awesome Icons next to their names (#20796) 
nice
 2023-04-29 09:58:48 +01:00
Pinta
bb6771ebf5 [MODULAR] Admins can now delete NIFs and NIFs now remove after being broken for two shifts. (#20514) 
* Update nif_persistence.dm

* Update nif_persistence.dm
 2023-04-13 03:33:15 +01:00
SkyratBot
9a594755f3 [MIRROR] Renames delta time to be a more obvious name [MDB IGNORE] (#20507) 
* Renames delta time to be a more obvious name

* updates to our code

---------

Co-authored-by: oranges <email@oranges.net.nz>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
 2023-04-12 20:45:43 +01:00
larentoun
1ffc500b71 fix: Removes lewd nifsoft if config is set to remove lewd (#20376) 
* fix: Removes lewd nifsoft if config is set to remove lewd

fix: correct check

* ref: Added lewd_nifsoft var to nifsofts

* ref: Lewd nifsoft uploaders check

* ref: Moves Nifsoft lewd deletion logic to nifsoft init
 2023-04-07 01:42:19 +01:00
Pinta
b1f31ac29c [MODULAR][QoL] Poem of Communal Souls is now redownloadable (#20305) 
nice
 2023-04-04 18:15:49 +01:00
Pinta
86574d99c3 [MODULAR] Reduces the prices of NIFSofts (#20304) 
* nerfs

* Update packs.dm

* this should be atomized

* Update nifs.dm
 2023-04-04 18:15:37 +01:00
Pinta
8033670703 [MODULAR] NIF Rewards Points (#19900) 
* base system

* proper shop support

* Update nif_persistence.dm

* Update modular_skyrat/modules/modular_implants/code/nifsofts.dm

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

* Update modular_skyrat/modules/modular_implants/code/nifsoft_catalog.dm

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

* Update modular_skyrat/modules/modular_implants/code/nifsoft_catalog.dm

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

* Update modular_skyrat/modules/modular_implants/code/nifsoft_catalog.dm

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

* some final fixes

* max rewards points

* Update nifsofts.dm

* Update nifsoft_catalog.dm

---------

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
 2023-04-03 02:11:52 +01:00
Pinta
129e71f0fc [MODULAR] Purpura Contract (#20129) 
* Update dorms.dm

* vending

* Update dorms.dm

* Update dorms.dm
 2023-04-01 03:32:41 +01:00
SkyratBot
3464b6bfb2 [MIRROR] Refactors Regenerate Organs, and a few organ helpers [MDB IGNORE] (#20094) 
* Refactors Regenerate Organs, and a few organ helpers

* MERGE CONFLICTS

* GETORGANSLOT > GET_ORGAN_SLOT

* GETORGAN > get_organ_by_type

* lint repairs

* more lint

* Update tgstation.dme

* Update surgery_step.dm

---------

Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
 2023-04-01 02:51:06 +01:00
Pinta
07137c582b [MODULAR][FIX] Grimoire Caeruleam Card and Dice Fix (#20002) 
Update prop_summoner.dm
 2023-03-27 04:12:56 +01:00
Pinta
e4f0f532d4 [MODULAR] Hivemind no longer preforms unnecessary sanitization. (#20003) 2023-03-26 18:00:20 -07:00
Pinta
8299557cb2 [MODULAR] NIF flavor text editing now occurs onChange rather than onInput (#20006) 2023-03-26 17:59:56 -07:00
Pinta
b160b3abcb [MODULAR] Removes pillows from Grimoire Purpura (#20061) 2023-03-26 17:58:41 -07:00
Pinta
f4313571ab [MODULAR] Poem of Communal Souls NIFSoft (#19884) 
* the start

* TGUI

* passing by

* more

* Update station_pass.dm

* persistence

* Update NifStationPass.js

* Update station_pass.dm

* Update station_pass.dm

* Update modular_skyrat/modules/modular_implants/code/nifsofts/station_pass.dm

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

* Update modular_skyrat/modules/modular_implants/code/nifsofts/station_pass.dm

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

* renaming

* Update soul_poem.dm

* Update soul_poem.dm

* Update soul_poem.dm

* cleans some more stuff up

* Update soul_poem.dm

* Update soul_poem.dm

* pain

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
 2023-03-23 15:05:43 -07:00
Pinta
b9295409cf [MODULAR] The adult helmet is no longer a space helmet along with some other tweaks. (#19790) 
* we did it

* Update deprivation_helmet.dm
 2023-03-13 04:42:42 +00:00
SkyratBot
cb3b675bae [MIRROR] Tablets don't close their UI when changing program (and some fixes) [MDB IGNORE] (#19600) 
* Tablets don't close their UI when changing program (and some fixes) (#73635)

## About The Pull Request

- Tablets now refresh their page when changing programs, this means the
UI will no longer close and reopen itself several times (or even have
several UIs open if shit broke hard enough).
- Removed tablet's attack self because interact already does everything
it had to do.
- Header programs now close when minimized (as there's no button to
close them in the main menu.
- Removed a lot of program UI stuff, it's now handled by the PC itself,
such as header data and ui host.
- Cut off asset sending from TGUI into it's own proc so I can re-send
assets when changing programs
- Added an ejection button for machine computers
- Fixed ID not ejecting into the user's hand when using 'Eject ID'
- Fixes a minor runtime when opening the MODsuit application without a
MODsuit already connected.

## Why It's Good For The Game

Fixes some bugs that I found with tablets

UIS now won't be flickering as bad in front of them, or have
inconsistent placement (like when you move your main menu UI, go to
Messenger, then it's back to the center of the screen).

Video of it in action

https://user-images.githubusercontent.com/53777086/221301417-78321149-0c10-475e-bd29-79f5a4ba0597.mp4

## Changelog

🆑
fix: Being in an application now properly uses the tablet's battery.
fix: Messenger and Themify apps now close when minimized, so don't count
towards the running app limit.
fix: Tablet UIs will now no longer spam open/close the UI when changing
applications
fix: Using the Eject ID button on tablets now ejects into your hand.
fix: Computers now have an Eject ID button
refactor: Cut down a lot of copy paste in tablet & program code, now
it's mostly done by the tablet.
/🆑

* Tablets don't close their UI when changing program (and some fixes)

* Update contractor_tablet.dm

* wew

---------

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
 2023-03-10 06:09:10 +00:00
Pinta
82dc5a7d77 [MODULAR] Dorms NIFSoft (#19718) 
* wew

* final touches

* Update prop_summoner.dm

* Ghost Roles

* Update modular_skyrat/modules/modular_implants/code/nifsofts/dorms.dm

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

* Update modular_skyrat/modules/modular_implants/code/nifsofts/dorms.dm

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

---------

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
 2023-03-09 19:49:12 -08:00
Pinta
ed52fecc80 [MODULAR] Adds new PDA themes to NIFs (#19719) 
Update nifs_tgui.dm
 2023-03-09 19:46:00 -08:00
Pinta
75692d71e6 [MODULAR] Replacces the NIFSoft Vendor with a PDA app (#18955) 
* start

* It's now a PDA app

* Update nifsoft_catalog.dm

* nice

* 🦀

* NIF GHOST BOX NIF GHOST BOX

* price updates

* whoops

* Update modular_skyrat/modules/modular_implants/code/nifs.dm

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

* Update modular_skyrat/modules/modular_implants/code/nifs.dm

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

* Update nifsoft_catalog.dm

* a

* Update wardrobes.dm

* Update wardrobes.dm

* Update nifsoft_catalog.dm

* Update NtosNifsoftCatalog.js

* Update modular_skyrat/modules/modular_implants/code/nifsoft_catalog.dm

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

* Update wardrobes.dm

* Update nifsoft_catalog.dm

* Update wardrobes.dm

---------

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
 2023-02-08 02:31:00 +00:00
Rimi Nosha
d95ca04819 [MODULAR] Fixes All Known Modular Persistence (NIF) Saving Issues (#19096) 
* Fuck

* Holy shit
 2023-02-08 02:01:25 +00:00
SkyratBot
1fe0d145a3 [MIRROR] Converts blindness and nearsightedness to status effects, scratches some VERY dumb blindness handling that resulted in mobs becoming "incurably" blind [MDB IGNORE] (#18760) 
* Converts blindness and nearsightedness to status effects, scratches some VERY dumb blindness handling that resulted in mobs becoming "incurably" blind

* Fixes the conflicts and makes shit compile!

* Fixes other things that didn't show up because I hadn't updated

* Fixes the lints.

* Okay NOW it's ready (please don't add anything else that touches blindness I beg you)

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
 2023-02-03 16:08:32 -05:00
Pinta
ae198af4d9 [MOSTLY MODULAR] NIFs (#18349) 
* Revert "Merge remote-tracking branch 'upstream/master' into NIFs"

This reverts commit c2aea213fd400f9d6d12d955340cb0e7d2f9c36f, reversing
changes made to 1bb613b64a603c280abec40d9c82fde69248b196.

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into NIFs""

This reverts commit 10a6f906f70857cfffd9ddef7b609fecc21da902.

* we don't need this (for right now)

* Update nifsoft_shop.dm

* new nif models

* Update nif_implants.dm

* we now have items

* nice

* logging and removers

* Update nifs.dm

* nif repair surgery

* death durability loss and EMPs

* more messages and NIF TGUI fix

* polish

* debug NIF and soulcatcher polish

* new phone action sprite

* NIFs for ghost roles

* Better EMP

* this doesn't really have a good reason to be here.

* lore

* Update modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm

Co-authored-by: Nerevar <12636964+Nerev4r@users.noreply.github.com>

* Update modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm

Co-authored-by: Nerevar <12636964+Nerev4r@users.noreply.github.com>

* Update code/controllers/subsystem/ticker.dm

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

* Update nif_implants.dm

* a

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Update nifs_tgui.dm

* Update modular_skyrat/modules/modular_implants/code/nifsofts/hivemind.dm

* Update modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm

* Update modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm

* Apply suggestions from code review

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

* fixes an oversight

* Apply suggestions from code review

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

* that wouldn't be good

* Update packs.dm

* Update nifs.dm

* Update nif_implants.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update misc_devices.dm

* Update dualboot.dm

* Update CentCom_skyrat_z2.dmm

* Update CentCom_skyrat_z2.dmm

* Update hivemind.dm

* Apply suggestions from code review

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

* Update packs.dm

* Update prop_summoner.dm

* Update shapeshifter.dm

* Update packs.dm

* Update nif_presistance.dm

* Update prop_summoner.dm

* Update dualboot.dm

* Apply suggestions from code review

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

* Apply suggestions from code review

Co-authored-by: Tastyfish <crazychris32@gmail.com>

* static data

* Update persistence.dm

* Update persistence.dm

* Update persistence.dm

* uhoh

* Update nif_presistance.dm

* Update nifs.dm

* pain

* Revert "pain"

This reverts commit 3adc919f849b68de2ab4245c7db26a02e85bf0c6.

* I don't know why this was in here

* Update nifsofts.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update shapeshifter.dm

* Update nifs.dm

* Update nifs.dm

* Update modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm

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

* Update prop_summoner.dm

* Update misc_devices.dm

* Delete BlueShift_upper.dmm

* Update prop_summoner.dm

* Update prop_summoner.dm

* vendor

* R&D

* Update nifsoft_shop.dm

* Update dualboot.dm

* Update NifPanel.js

* Update money_sense.dm

* I'm sorry for what I must do

* Update money_sense.dm

* cost adjustments

* theme

* Update nifsoft_shop.dm

* examine fix

* examine text change

* Money Sense is now a trait

* Revert "Money Sense is now a trait"

This reverts commit 16c124ffb2cb70136abe6eb41b330d389208afa7.

* component

* Update modular_skyrat/modules/modular_implants/code/nifs.dm

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

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* we do a bit of file moving

* component

* Update nifs.dm

* Update hivemind.dm

* Update hivemind.dm

* Update prop_summoner.dm

* Revert "Merge remote-tracking branch 'upstream/master' into NIFs"

This reverts commit a7f7945eaa9c9ed6f9253b7cb71c6be79f3bf9e9, reversing
changes made to bca1a7f1811d3a82bf253c5a8d70431567c399a7.

* Revert "Merge remote-tracking branch 'upstream/master' into NIFs"

This reverts commit bca1a7f1811d3a82bf253c5a8d70431567c399a7, reversing
changes made to 2559afc7a9737863f7d96494e01216a1ea0f5428.

* Revert "Merge remote-tracking branch 'upstream/master' into NIFs"

This reverts commit e8293971b07a2ffbe61a7e17d5f9ac94b47ef5bc, reversing
changes made to dad4ef7a9ac697d0e887c336bd486c17fb54f2a8.

* whoops

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into NIFs""

This reverts commit c607aca6bc3e55cc724f25fa6e38011b05ebc8c6.

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into NIFs""

This reverts commit b42f89b9c647d845a17732f1caaf1a50dcdd4515.

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into NIFs""

This reverts commit 1d6ffe92bcaa8035f8918dc533870ec4b74ed9a3.

* Apply suggestions from code review

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

* fixes things

* Update nifs.dm

* QoL

* no more summoning infinite items

* start of componentization

* Update prop_summoner.dm

* FIRMLY GRASP IT!

* Update prop_summoner.dm

* Update prop_summoner.dm

* Update nifsofts.dm

* Update prop_summoner.dm

* Update nifsoft_shop.dm

* boy, I really hope somebody got fired for that blunder

* Update nif_presistance.dm

* mistakes were made.

* Delete CentCom_skyrat_z2.dmm

* Revert "Delete CentCom_skyrat_z2.dmm"

This reverts commit 8a1cdc4b065246fb07cbaf5461d01565e0ddbe06.

* Update CentCom_skyrat_z2.dmm

* Update CentCom_skyrat_z2.dmm

* It's a solution

* Update CentCom_skyrat_z2.dmm

* Update CentCom_skyrat_z2.dmm

* Update NifPanel.js

* Price changes

* Update nif_presistance.dm

* Such devastation, this was not my intention.

* Woooo!

* Documentation

* cryo fix

* I am sorry to anyone that had a NIF before the persistence change

* Update nif.dm

* I need to figure out why this is happening.

* Apply suggestions from code review

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

* a

* Update modular_persistence.dm

* Update modular_persistence.dm

* Update nifs.dm

* Update nifs.dm

* I do the code

* Hopefully this helps

* Update ticker.dm

* Update modular_persistence.dm

* Removes client requirement

* Use brain, much better for allowing persistent organs and similar in the future.

* Did testing, it fucking works now.

* Update mind_linker.dm

* Update misc_devices.dm

* Update misc_devices.dm

* Update nifs_tgui.dm

* Thanks gamers :^)

* a

* Update nifsoft_shop.dm

* Update nifsofts.dm

* Update hivemind.dm

* Update hivemind.dm

* Update prop_summoner.dm

* whoops

* FUUUUCK

* FUCK x2

* this feels like cargo job gear

* stack trace

* roundstart fix

* Update modular_skyrat/modules/modular_implants/code/nifsofts/prop_summoner.dm

Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com>

* Update modular_persistence.dm

* Update nifs.dm

* Update hivemind.dm

* Update nifs.dm

* vital spelling fix

* whoopsie

* Update nif_persistence.dm

* power_refactor

* durability refactor

* a

* Update nifsofts.dm

* pain

* Update modular_skyrat/modules/modular_implants/code/nifs.dm

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

* Update nifsofts.dm

* Update packs.dm

* Update nifs.dm

* Update nifs.dm

Co-authored-by: Nerevar <12636964+Nerev4r@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
Co-authored-by: RimiNosha <riminosha@gmail.com>
Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com>
 2023-01-24 14:27:00 -08:00