cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-25 14:16:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9297 from MistakeNot4892/anomalies

Browse Source 
Corrects arg indices in artifact attacby callback.
This commit is contained in:
Atermonera
2023-12-28 21:12:12 -08:00
committed by GitHub
parent 65f53a2768 61bfc7a017
commit 06896a8db8
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/xenoarcheaology/effect_master.dm
+3 -4
View File
@@ -294,7 +294,7 @@
/datum/component/artifact_master/proc/on_attackby()
var/obj/item/W = args[0]
var/obj/item/W = args[2]
for(var/datum/artifact_effect/my_effect in my_effects)
if (istype(W, /obj/item/reagent_containers))
@@ -325,11 +325,10 @@
else
if (my_effect.trigger == TRIGGER_FORCE && W.force >= 10)
return my_effect.ToggleActivate()
return my_effect.attackby(args[1], args[0])
return my_effect.attackby(args[3], args[2])
/datum/component/artifact_master/proc/on_reagent()
var/datum/reagent/Touching = args[2]
var/datum/reagent/Touching = args[1]
var/list/water = list("hydrogen", "water")
var/list/acid = list("sacid", "pacid", "diethylamine")