cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-15 01:54:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-24-10a

Browse Source
This commit is contained in:
Majkl-J
2024-10-20 04:12:02 -07:00
parent 90dd415a64 9e64cab0db
commit f8faccd70a
1411 changed files with 131464 additions and 65514 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm
+1 -1
View File
@@ -157,7 +157,7 @@
/datum/computer_file/program/messenger/ui_state(mob/user)
if(issilicon(user))
return GLOB.reverse_contained_state
return GLOB.deep_inventory_state
return GLOB.default_state
/datum/computer_file/program/messenger/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
code/modules/modular_computers/file_system/programs/virtual_pet.dm
+1 -1
View File
@@ -429,7 +429,7 @@ GLOBAL_LIST_EMPTY(virtual_pets_list)
var/static/list/possible_emotes = list(
/datum/emote/flip,
/datum/emote/living/jump,
/datum/emote/jump,
/datum/emote/living/shiver,
/datum/emote/spin,
/datum/emote/silicon/beep,