Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

[s] Bluespace RPED no longer will remotely exchange beakers if the replacement beakers have reagents in them #13869

Merged
JamieD1 merged 3 commits into from
Apr 24, 2022
Merged

[s] Bluespace RPED no longer will remotely exchange beakers if the replacement beakers have reagents in them #13869

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a01336
Update _machinery.dm
ToasterBiome Apr 24, 2022
15e0da4
Revert "Update _machinery.dm"
ToasterBiome Apr 24, 2022
499847a
Update _machinery.dm
ToasterBiome Apr 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/game/machinery/_machinery.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,9 @@ Class Procs:
break
for(var/obj/item/B in W.contents)
if(istype(B, P) && istype(A, P))
//won't replace beakers if they have reagents in them to prevent funny explosions
if(istype(B,/obj/item/reagent_containers) && !isemptylist(B.reagents?.reagent_list))
continue
// If it's a corrupt or rigged cell, attempting to send it through Bluespace could have unforeseen consequences.
if(istype(B, /obj/item/stock_parts/cell) && W.works_from_distance)
var/obj/item/stock_parts/cell/checked_cell = B
Expand Down