cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-09 16:05:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

organic interface update (#6740)

Browse Source 
* initial

* whoops

* more fixes

* forgot

* frick

* oop

* minor visual fixes

* cleared out-of-date stuff that was asimilated by erp update. ye, sry for that but useroth said i can if i need to

* interface fixes + cleaned trash.

* fixesss

* more fixes

* other interface fix and im dumb

* text and fonts fixes

* mapfixes

* small item fix

* floppa my beloved

* fixme

* yepp

* little addition to vibrator

* more user friendly toys

* hotfix because im dumb

* informing user about stuff happening in their genitals

* Fixed strip menu for new slots

* Vibrating toys now makes constant vibration sounds.

* fucking ton of fixes, i debugged so much stuff i want to die when did i slept last time

* signal vibrator fixes

* i guess its all bugs for now, need testing

* hotfix

* chemicals fixed. other dumb bug fixed too

* feex

* undo

* aight, some text stuff

* repsrited signal vibrator, fixed some dumb bugs. Almost ready for tommorrow pr.

* tried to fix things, need to test

* fixed?

* maybe now its fixed

* we finished here.

* yeah, credits. I forgot them.

* Oh well, resolved the conflict wrong.

* map fixed

* formatting test

* more linter stuff

* did changed that skyrat asked me to

* kinda fixed more stuff

* remove mapchanges

* no magic like kat magic

* please

* further mapchanges removal

* fix

* little fix, because one map supposed to be changed.

* quick structure fixes + balance stuff

* some fixes. remind - fix worn tomorrow.

* ah fuck it, i fixed it now. Who need sleep anyway?

* furnitures are no longer invuln

* fixes poles

* milking machine uses cuffs instead

* makes stuff uses cuffs

* frick

* fix lints

* stuffe

* line

* Forgot to add this little feature

* OKAY FINE I GUESS 10 MINUTES IS TOO MUCH.

* squashed bugs

* minor fix to prevent visual bugs with pillow piles.

* frick

* removed logging

* pref for toys

* tabs

* suggested idea added

* hot fix

* Revert "suggested idea added"

This reverts commit 33796f0abb896b83d02dbefee4e3b62df5f6a5db.

* Revert "hot fix"

This reverts commit bf0bc6330f5897ce2d67bb9571eb818d3a64325b.

* fuck the suggestions, i just want it to work fine

* fuck the suggestions, i just want it to work fine

* truly fixes lints

* balance tweaks + fleshlight fixed

* more balance tweaks

* gasmask fixes. Now it doesn't kill people but still makes them suffer

* fix ball mittens

* dead people tell no tales

* some minor fixes

* grammars

* add messages

* use a new pref

* simple check

* knock-knock. Who? A fix.

* fuck

* fixes vibrators

* hexacrocin now can be cured properly

* fix x_stand

* frick

* FUCK

* fixes everyonr being horny

* fixes pain

* fixes strapon

* stop process

* nymphomania fixed

* fix spam

* fixed heels and quirks

* Dead people shouldn't cum

* Knock-knock. A penis enlarger fix

* use the traits goddamn it

* Nymphomania fix

* Fucking moths can't now chomp vibrators

* Added yes/no check to climax button, also some improvements and multiple messages bugfix

* milking machine balance tweaks, bimbo trauma fix

* milking machine construction messages added

* some fixes

* Revert "Fucking moths can't now chomp vibrators"

This reverts commit 2bf37ca3b0b98c3bbd7bf35626faa7a0be54fcfb.

* little clean up of code, but it still doesn't works properly

* fuck the moths. You can't eat vibrators once more.

* catsuit bug fix

* balance tweaks

* Pillows now made of cloth, not metal.

* pillow fixes

* masochism quick fix

* dumb quickfix, it will break anything, don't panic

* yay now it works again

* nymphomania fix

* clean up

* half of ball mittens fix. For another half buy our DLC just for 2,99$!

* IM COOL I FIXED THE BALL MITTENS! FINALLY!

* prefs now works properly

* pain stuff fixed, i guess. no more arousal by decompression damage.

* lol how did i missed those

* can't buckle fucking cows to milker anymore

* oops

* me cool

* fixed small bug with pillows

* gasmask quick fix

* fix spam

* fixes strapon

* balance stuff.

* fix because im dumb

* fix

* the last fix for this codebomination. I hope this is it.

Co-authored-by: Katherine Kiefer <sterlite2902@gmail.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
This commit is contained in:
Lamella-0587
2021-08-13 20:33:44 +03:00
committed by GitHub
parent 71e5502d4d
commit a702f9bd9f
207 changed files with 14643 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
code/_onclick/hud/hud.dm
View File

@@ -113,6 +113,9 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
pull_icon = null
QDEL_LIST(toggleable_inventory)
//SKYRAT EDIT ADDITION BEGIN - ERP_SLOT_SYSTEM
QDEL_LIST(ERP_toggleable_inventory) // Destroy ERP stuff
//SKYRAT EDIT ADDITION END
QDEL_LIST(hotkeybuttons)
throw_icon = null
QDEL_LIST(infodisplay)
@@ -169,6 +172,10 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
screenmob.client.screen += static_inventory
if(toggleable_inventory.len && screenmob.hud_used && screenmob.hud_used.inventory_shown)
screenmob.client.screen += toggleable_inventory
//SKYRAT EDIT ADDITION BEGIN - ERP_SLOT_SYSTEM
if(ERP_toggleable_inventory.len && screenmob.hud_used && screenmob.hud_used.ERP_inventory_shown && screenmob.client?.prefs.sextoys_pref == "Yes")
screenmob.client.screen += ERP_toggleable_inventory
//SKYRAT EDIT ADDITION END
if(hotkeybuttons.len && !hotkey_ui_hidden)
screenmob.client.screen += hotkeybuttons
if(infodisplay.len)
@@ -185,6 +192,10 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
screenmob.client.screen -= static_inventory
if(toggleable_inventory.len)
screenmob.client.screen -= toggleable_inventory
//SKYRAT EDIT ADDITION BEGIN - ERP_SLOT_SYSTEM
if(ERP_toggleable_inventory.len && screenmob.hud_used && screenmob.hud_used.ERP_inventory_shown && screenmob.client?.prefs.sextoys_pref == "Yes")
screenmob.client.screen -= ERP_toggleable_inventory
//SKYRAT EDIT ADDITION END
if(hotkeybuttons.len)
screenmob.client.screen -= hotkeybuttons
if(infodisplay.len)
@@ -205,6 +216,10 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
screenmob.client.screen -= static_inventory
if(toggleable_inventory.len)
screenmob.client.screen -= toggleable_inventory
//SKYRAT EDIT ADDITION BEGIN - ERP_SLOT_SYSTEM
if(toggleable_inventory.len && screenmob.hud_used && screenmob.hud_used.ERP_inventory_shown && screenmob.client?.prefs.sextoys_pref == "Yes")
screenmob.client.screen -= ERP_toggleable_inventory
//SKYRAT EDIT ADDITION END
if(hotkeybuttons.len)
screenmob.client.screen -= hotkeybuttons
if(infodisplay.len)
@@ -263,6 +278,12 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
if (item.icon == ui_style)
item.icon = new_ui_style
//SKYRAT EDIT ADDITION BEGIN - ERP_SLOT_SYSTEM
for(var/atom/item in ERP_toggleable_inventory)
if (item.icon == ui_style)
item.icon = new_ui_style
//SKYRAT EDIT ADDITION END
ui_style = new_ui_style
build_hand_slots()
hide_actions_toggle.InitialiseIcon(src)