cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10370 from VOREStation/upstream-merge-8087

Browse Source 
[MIRROR] SSpersistence tweaks
This commit is contained in:
Aronai Sieyes
2021-05-27 12:30:12 -04:00
committed by Chompstation Bot
parent bbafe17f3b
commit f6bcad07df
2 changed files with 282 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/food/kitchen/smartfridge/smartfridge.dm
View File

@@ -13,7 +13,7 @@
idle_power_usage = 5 idle_power_usage = 5
active_power_usage = 100 active_power_usage = 100
flags = NOREACT flags = NOREACT
var/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000. //VOREStation Edit - Nonglobal so subtypes can override to lower values var/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000.
var/list/item_records = list() var/list/item_records = list()
var/datum/stored_item/currently_vending = null //What we're putting out of the machine. var/datum/stored_item/currently_vending = null //What we're putting out of the machine.
var/stored_datum_type = /datum/stored_item var/stored_datum_type = /datum/stored_item

2
code/modules/persistence/effects/paper_sticky.dm
View File

@@ -6,12 +6,14 @@
/datum/persistent/paper/sticky/CreateEntryInstance(var/turf/creating, var/list/token) /datum/persistent/paper/sticky/CreateEntryInstance(var/turf/creating, var/list/token)
var/atom/paper = ..() var/atom/paper = ..()
if(paper) if(paper)
//VOREStation add - sometimes they fall off
if(prob(90)) if(prob(90))
paper.pixel_x = token["offset_x"] paper.pixel_x = token["offset_x"]
paper.pixel_y = token["offset_y"] paper.pixel_y = token["offset_y"]
else else
paper.pixel_x = rand(-5,5) paper.pixel_x = rand(-5,5)
paper.pixel_y = rand(-5,5) paper.pixel_y = rand(-5,5)
//VOREStation add end
paper.color = token["color"] paper.color = token["color"]
return paper return paper