Skip to content

Commit

Permalink
[MIRROR] Fix warning on master (#2292)
Browse files Browse the repository at this point in the history
* Fix warning on master (#83014)

:cl: Melbert
fix: New machine god blessings now actually works probably
/:cl:

* Fix warning on master

---------

Co-authored-by: MrMelbert <[email protected]>
  • Loading branch information
2 people authored and StealsThePRs committed May 3, 2024
1 parent 2dcaab8 commit 198edf2
Showing 1 changed file with 33 additions and 0 deletions.
33 changes: 33 additions & 0 deletions code/modules/religion/rites.dm
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,46 @@
/datum/religion_rites/machine_blessing/invoke_effect(mob/living/user, atom/movable/religious_tool)
..()
var/altar_turf = get_turf(religious_tool)
<<<<<<< HEAD

Check failure on line 131 in code/modules/religion/rites.dm

View workflow job for this annotation

GitHub Actions / Run Linters

got '<<', expected one of: newline, '/', identifier
var/blessing = pick(
/obj/item/organ/internal/cyberimp/arm/surgery,
/obj/item/organ/internal/cyberimp/eyes/hud/diagnostic,
/obj/item/organ/internal/cyberimp/eyes/hud/medical,
/obj/item/organ/internal/cyberimp/mouth/breathing_tube,
/obj/item/organ/internal/cyberimp/chest/thrusters,
/obj/item/organ/internal/eyes/robotic/glow,
=======
var/blessing = pick_weight_recursive(
list(
// Arms
list(
/obj/item/organ/internal/cyberimp/arm/combat = 1,
/obj/item/organ/internal/cyberimp/arm/surgery = 1000000,
/obj/item/organ/internal/cyberimp/arm/toolset = 1500000,
) = 15,
// Eyes
list(
/obj/item/organ/internal/cyberimp/eyes/hud/diagnostic = 1,
/obj/item/organ/internal/cyberimp/eyes/hud/medical = 1,
/obj/item/organ/internal/eyes/robotic/glow = 1,
/obj/item/organ/internal/eyes/robotic/shield = 2,
) = 15,
// Chest
list(
/obj/item/organ/internal/cyberimp/chest/reviver = 1,
/obj/item/organ/internal/cyberimp/chest/thrusters = 2,
) = 9,
// Brain / Head
list(
/obj/item/organ/internal/cyberimp/brain/anti_drop = 100,
/obj/item/organ/internal/cyberimp/brain/anti_stun = 10,
) = 10,
// Misc
list(
/obj/item/organ/internal/cyberimp/mouth/breathing_tube = 1,
) = 5,
)
>>>>>>> ca9ac2104e4 ([MIRROR] Fix warning on master (#2292))
)
new blessing(altar_turf)
return TRUE
Expand Down

0 comments on commit 198edf2

Please sign in to comment.