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

Merge remote-tracking branch 'skrat/master' into upstream-2024-02-03

Browse Source 
# Conflicts:
#	_maps/map_files/IceBoxStation/IceBoxStation.dmm
#	_maps/map_files/KiloStation/KiloStation.dmm
#	_maps/map_files/tramstation/tramstation.dmm
#	_maps/skyrat/automapper/automapper_config.toml
#	code/controllers/subsystem/statpanel.dm
#	code/datums/chatmessage.dm
#	code/datums/quirks/negative_quirks/claustrophobia.dm
#	code/game/objects/items/tools/weldingtool.dm
#	code/modules/client/preferences/middleware/quirks.dm
#	code/modules/mob/living/carbon/carbon_defense.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	code/modules/mob/living/living_say.dm
#	code/modules/modular_computers/file_system/programs/jobmanagement.dm
#	code/modules/projectiles/guns/energy/kinetic_accelerator.dm
#	code/modules/research/designs/mechfabricator_designs.dm
#	code/modules/research/machinery/_production.dm
#	code/modules/surgery/organs/internal/_internal_organ.dm
#	html/changelogs/archive/2024-01.yml
#	modular_skyrat/modules/automapper/code/area_spawn_entries.dm
#	modular_skyrat/modules/jukebox/code/jukebox_subsystem.dm
#	modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm
#	modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm
#	modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm
#	modular_skyrat/modules/synths/code/bodyparts/power_cord.dm
#	tgstation.dme
#	tgui/packages/tgui/components/Dropdown.tsx
#	tgui/packages/tgui/components/Input.tsx
#	tgui/packages/tgui/interfaces/Fabrication/DesignBrowser.tsx
#	tgui/packages/tgui/interfaces/Jukebox.jsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/data.ts
#	tgui/packages/tgui/interfaces/common/SearchBar.tsx
This commit is contained in:
nevimer
2024-02-03 21:08:40 -05:00
parent 0268379bb9 23ef603df9
commit 4d8898fdef
1451 changed files with 57801 additions and 80514 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
-13
View File
@@ -396,19 +396,6 @@
var/target = href_list["showmessageckeylinkless"]
browse_messages(target_ckey = target, linkless = 1)
else if(href_list["messageread"])
if(!isnum(href_list["message_id"]))
return
var/rounded_message_id = round(href_list["message_id"], 1)
var/datum/db_query/query_message_read = SSdbcore.NewQuery(
"UPDATE [format_table_name("messages")] SET type = 'message sent' WHERE targetckey = :player_key AND id = :id",
list("id" = rounded_message_id, "player_key" = usr.ckey)
)
if(!query_message_read.warn_execute())
qdel(query_message_read)
return
qdel(query_message_read)
else if(href_list["messageedits"])
if(!check_rights(R_ADMIN))
return