cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 12:37:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8298

Browse Source
This commit is contained in:
MistakeNot4892
2022-08-25 14:26:20 +10:00
parent a37e070121 62596ad725
commit d717a4b50a
1603 changed files with 70496 additions and 61794 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/persistence/graffiti.dm
+1 -1
View File
@@ -55,7 +55,7 @@
to_chat(user, SPAN_WARNING("You are banned from leaving persistent information across rounds."))
return
var/_message = sanitize(input(usr, "Enter an additional message to engrave.", "Graffiti") as null|text, trim = TRUE)
var/_message = sanitize(tgui_input_text(usr, "Enter an additional message to engrave.", "Graffiti"), trim = TRUE)
if(_message && loc && user && !user.incapacitated() && user.Adjacent(loc) && thing.loc == user)
user.visible_message("<span class='warning'>\The [user] begins carving something into \the [loc].</span>")
if(do_after(user, max(20, length(_message)), src) && loc)
code/modules/persistence/storage/smartfridge.dm
+2 -2
View File
@@ -65,12 +65,12 @@
/datum/persistent/storage/smartfridge/produce
name = "fruit storage"
max_storage = 50
store_per_type = FALSE
store_per_type = TRUE
target_type = /obj/machinery/smartfridge/produce
/datum/persistent/storage/smartfridge/produce/lossy
name = "fruit storage lossy"
go_missing_chance = 12.5 // 10% loss between rounds
go_missing_chance = 10 // 10% loss chance between rounds
/datum/persistent/storage/smartfridge/produce/generate_items(var/list/L) // Mostly same as storage/generate_items() but without converting string to path
. = list()