cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add fail-safes to disposal sort junctions, fix looping (#20099)

Browse Source 
* Remove the weird hacky stuff and default to disposals

* Update disposal.dm

* That's superfluous with the other checks

* Update lavaland_biodome_clown_planet.dmm

* Update cyberiad.dmm

* Added stack traces, split into mapload proc

* Update code/modules/recycling/disposal.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
Vi3trice
2023-01-07 11:11:29 -05:00
committed by GitHub
parent ecf6d798b1
commit 9de7b3c2ce
5 changed files with 63 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/sortingmachinery.dm
+4 -8
View File
@@ -8,7 +8,7 @@
var/obj/wrapped = null
var/init_welded = FALSE
var/giftwrapped = FALSE
var/sortTag = 0
var/sortTag = 1
/obj/structure/bigDelivery/Destroy()
var/turf/T = get_turf(src)
@@ -81,7 +81,7 @@
icon_state = "deliverycrate2"
var/obj/item/wrapped = null
var/giftwrapped = FALSE
var/sortTag = 0
var/sortTag = 1
/obj/item/smallDelivery/ex_act(severity)
for(var/atom/movable/AM in contents)
@@ -307,15 +307,11 @@
// travels through the pipes.
for(var/obj/structure/bigDelivery/O in src)
deliveryCheck = 1
if(O.sortTag == 0)
O.sortTag = 1
for(var/obj/item/smallDelivery/O in src)
deliveryCheck = 1
if(O.sortTag == 0)
O.sortTag = 1
for(var/obj/item/shippingPackage/O in src)
deliveryCheck = 1
if(!O.sealed || O.sortTag == 0) //unsealed or untagged shipping packages will default to disposals
if(!O.sealed) //unsealed shipping packages will default to disposals
O.sortTag = 1
if(deliveryCheck == 0)
H.destinationTag = 1
@@ -367,7 +363,7 @@
icon = 'icons/obj/storage.dmi'
icon_state = "shippack"
var/obj/item/wrapped = null
var/sortTag = 0
var/sortTag = 1
var/sealed = 0
/obj/item/shippingPackage/attackby(obj/item/O, mob/user, params)