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

Fix merge of 8087

Browse Source
This commit is contained in:
Aronai Sieyes
2021-05-27 12:19:48 -04:00
parent c57dfd7653
commit b78ca7575a
2 changed files with 2 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/persistence/effects/paper_sticky.dm
+2 -5
View File
@@ -6,17 +6,14 @@
/datum/persistent/paper/sticky/CreateEntryInstance(var/turf/creating, var/list/token)
var/atom/paper = ..()
if(paper)
<<<<<<< HEAD
//VOREStation add - sometimes they fall off
if(prob(90))
paper.pixel_x = token["offset_x"]
paper.pixel_y = token["offset_y"]
else
paper.pixel_x = rand(-5,5)
paper.pixel_y = rand(-5,5)
=======
paper.pixel_x = token["offset_x"]
paper.pixel_y = token["offset_y"]
>>>>>>> 9cd4a89... SSpersistence tweaks (#8087)
//VOREStation add end
paper.color = token["color"]
return paper