Skip to content

Commit

Permalink
Fixes borgs being unable to pick up some items. (ParadiseSS13#26791)
Browse files Browse the repository at this point in the history
* Fixes cyborg stack merging

* i dint push

* Wait, this is fine actually
  • Loading branch information
BiancaWilkson authored Sep 17, 2024
1 parent 9b0967a commit 8883a72
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 0 deletions.
3 changes: 3 additions & 0 deletions code/game/objects/items/stacks/medical_packs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@
healverb = "salve"
heal_burn = 10
dynamic_icon_state = TRUE
merge_type = /obj/item/stack/medical/ointment

/obj/item/stack/medical/ointment/apply(mob/living/M, mob/user)
if(..())
Expand Down Expand Up @@ -258,6 +259,7 @@
belt_icon = "burnkit"
heal_burn = 25
dynamic_icon_state = FALSE
merge_type = /obj/item/stack/medical/ointment/advanced

/obj/item/stack/medical/ointment/advanced/cyborg
energy_type = /datum/robot_storage/energy/medical/adv_burn_kit
Expand Down Expand Up @@ -308,6 +310,7 @@
icon_state = "splint"
unique_handling = TRUE
self_delay = 100
merge_type = /obj/item/stack/medical/splint
var/other_delay = 0

/obj/item/stack/medical/splint/apply(mob/living/M, mob/user)
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/stacks/nanopaste.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
amount = 6
max_amount = 6
toolspeed = 1
merge_type = /obj/item/stack/nanopaste

/obj/item/stack/nanopaste/attack(mob/living/M as mob, mob/user as mob)
if(!istype(M) || !istype(user))
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/stacks/tiles/tile_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@
mineralType = "metal"
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 70)
resistance_flags = FIRE_PROOF
merge_type = /obj/item/stack/tile/plasteel

/obj/item/stack/tile/plasteel/cyborg
energy_type = /datum/robot_storage/energy/metal_tile
Expand Down

0 comments on commit 8883a72

Please sign in to comment.