cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-05 22:43:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disks don't delete eachother & Grammar fix (#73173)

Browse Source 
## About The Pull Request

CtrlShift LMB screentip key now says you'll remove the disk instead of
the drive, to be more accurate to what it does. Also checks for a disk
when you try to add a new one in, preventing new disks from deleting the
old by swapping disks instead.

## Why It's Good For The Game

Bug fixes for feature freeze, swag
Adds a better description and prevents the deletion of disks.

## Changelog

🆑
fix: Computers no longer delete disks if you try to add a second one.
spellcheck: Computer screentips says you're now removing the disk
instead of the SSD.
/🆑
This commit is contained in:
John Willard
2023-02-04 06:40:17 -05:00
committed by GitHub
parent 85fdc328a3
commit 80467ddc0a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/modular_computers/computers/item/computer.dm
View File

@@ -383,7 +383,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar
. = CONTEXTUAL_SCREENTIP_SET
if(inserted_disk)
context[SCREENTIP_CONTEXT_CTRL_SHIFT_LMB] = "Remove SSD"
context[SCREENTIP_CONTEXT_CTRL_SHIFT_LMB] = "Remove Disk"
. = CONTEXTUAL_SCREENTIP_SET
return . || NONE
@@ -780,6 +780,9 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar
// Insert a data disk
if(istype(attacking_item, /obj/item/computer_disk))
if(inserted_disk)
user.put_in_hands(inserted_disk)
balloon_alert(user, "disks swapped")
if(!user.transferItemToLoc(attacking_item, src))
return
inserted_disk = attacking_item