Skip to content

Commit

Permalink
right, it works now
Browse files Browse the repository at this point in the history
  • Loading branch information
RikuTheKiller committed Sep 29, 2024
1 parent 232a0fc commit f334d7f
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 4 deletions.
17 changes: 15 additions & 2 deletions monkestation/code/modules/cybernetics/augments/chest_augments.dm
Original file line number Diff line number Diff line change
Expand Up @@ -556,12 +556,20 @@

return TRUE

/datum/bodypart_overlay/simple/dualwield
icon = 'monkestation/code/modules/cybernetics/icons/implants.dmi'
icon_state = "ccms_overlay"
layers = EXTERNAL_ADJACENT

/obj/item/organ/internal/cyberimp/chest/dualwield
name = "C.C.M.S implant"
desc = "Short for Complementary Combat Maneuvering System, it processes spinal nerve signals and enacts forced complementary maneuvers on the opposite side of the user's body when they attack. In layman's terms, it lets you dual wield."
icon = 'monkestation/code/modules/cybernetics/icons/implants.dmi'
icon_state = "ccms"
//encode_info = AUGMENT_SYNDICATE_LEVEL
encode_info = AUGMENT_SYNDICATE_LEVEL

visual_implant = TRUE
bodypart_overlay = /datum/bodypart_overlay/simple/dualwield

/obj/item/organ/internal/cyberimp/chest/dualwield/on_insert(mob/living/carbon/organ_owner, special)
. = ..()
Expand Down Expand Up @@ -613,11 +621,16 @@
/obj/item/organ/internal/cyberimp/chest/dualwield/proc/handle_side_effects(obj/item/item, mob/target)
return FALSE // Returning true means we misfired, i.e. failed to dual wield even though it should have triggered under normal circumstances.

/datum/bodypart_overlay/simple/dualwield/refurbished
icon_state = "ccms_overlay_refurbished"

/obj/item/organ/internal/cyberimp/chest/dualwield/refurbished
name = "refurbished C.C.M.S implant"
desc = "A refurbished dual wielding implant. It looks old and the nerve filaments have degraded, but it's still functional."
icon_state = "ccms_refurbished"

bodypart_overlay = /datum/bodypart_overlay/simple/dualwield/refurbished

/obj/item/organ/internal/cyberimp/chest/dualwield/refurbished/handle_side_effects(obj/item/item, mob/target)
if(prob(20)) // Low probability for it to not work at all.
owner.visible_message(
Expand All @@ -626,7 +639,7 @@
)
return TRUE // Cancels the complementary attack.

if(prob(30)) // Higher probability for it to cause some damage, but still work.
if(prob(30)) // And if it does work, it might cause some damage.
owner.visible_message(
message = span_warning("[owner]'s arm spazzes out!"),
self_message = span_danger("Your arm spazzes out!")
Expand Down
14 changes: 12 additions & 2 deletions monkestation/code/modules/cybernetics/augments/uplink/uplink.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/uplink_item/bundles_tc/sandy
name = "Sandevistan Bundle"
desc = "A box containing various implants"
desc = "A box containing autosurgeons for a cyberlink and a sandevistan, allowing you to outspeed targets."
item = /obj/item/storage/box/syndie_kit/sandy
cost = 12
purchasable_from = UPLINK_TRAITORS
Expand All @@ -12,7 +12,7 @@

/datum/uplink_item/bundles_tc/mantis
name = "Mantis Blade Bundle"
desc = "A box containing various implants"
desc = "A box containing autosurgeons for a cyberlink and two mantis blade implants, one for each arm."
item = /obj/item/storage/box/syndie_kit/mantis
cost = 12
purchasable_from = UPLINK_TRAITORS
Expand All @@ -22,3 +22,13 @@
new /obj/item/autosurgeon/organ/syndicate/syndie_mantis(src)
new /obj/item/autosurgeon/organ/syndicate/syndie_mantis/l(src)

/datum/uplink_item/bundles_tc/dualwield
name = "C.C.M.S Bundle"
desc = "A box containing autosurgeons for a cyberlink and a C.C.M.S implant that lets you dual wield melee weapons."
item = /obj/item/storage/box/syndie_kit/dualwield
cost = 12
purchasable_from = UPLINK_TRAITORS

/obj/item/storage/box/syndie_kit/dualwield/PopulateContents()
new /obj/item/autosurgeon/organ/cyberlink_syndicate(src)
new /obj/item/autosurgeon/organ/syndicate/dualwield(src)
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,15 @@
price_min = CARGO_CRATE_VALUE * 5
price_max = CARGO_CRATE_VALUE * 7

/datum/market_item/auction/shoddy_implant/chest/dualwield
name = "refurbished C.C.M.S implant"
desc = "A refurbished dual wielding implant. It's old and might misfire, but it's still functional."
item = /obj/item/organ/internal/cyberimp/chest/dualwield/refurbished
auction_weight = 1 // It practically doubles your damage.

price_min = CARGO_CRATE_VALUE * 6
price_max = CARGO_CRATE_VALUE * 8

/datum/market_item/auction/shoddy_implant/arm
category = "Arm Implants"

Expand Down
Binary file modified monkestation/code/modules/cybernetics/icons/implants.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
/obj/item/autosurgeon/organ/syndicate/sandy
starting_organ = /obj/item/organ/internal/cyberimp/chest/sandevistan

/obj/item/autosurgeon/organ/syndicate/dualwield
starting_organ = /obj/item/organ/internal/cyberimp/chest/dualwield

/obj/item/autosurgeon/skillchip
name = "skillchip autosurgeon"
desc = "A device that automatically inserts a skillchip into the user's brain without the hassle of extensive surgery. \
Expand Down
Binary file modified monkestation/icons/obj/medical/organs/organs.dmi
Binary file not shown.

0 comments on commit f334d7f

Please sign in to comment.