Skip to content

Commit

Permalink
Harpoon Fixes (#4570)
Browse files Browse the repository at this point in the history
Diamonds removed and bug fixed
  • Loading branch information
Jackofashepard authored and ACCount12 committed Jan 27, 2020
1 parent 7926c47 commit 22867bd
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion code/game/objects/items/weapons/space_harpoon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
throw_range = 20
origin_tech = list(TECH_BLUESPACE = 5)
price_tag = 4000
matter = list(MATERIAL_SILVER = 10, MATERIAL_GOLD = 5, MATERIAL_DIAMOND = 2, MATERIAL_PLASMA = 20, MATERIAL_PLASTIC = 20)
matter = list(MATERIAL_SILVER = 10, MATERIAL_GOLD = 5, MATERIAL_PLASMA = 20, MATERIAL_PLASTIC = 20)
var/mode = MODE_TRANSMIT
var/transforming = FALSE // mode changing takes some time
var/offset_chance = 5 //chance to teleport things in wrong place
Expand Down Expand Up @@ -46,6 +46,7 @@

if(!cell || !cell.checked_use(100))
to_chat(user, SPAN_WARNING("[src] battery is dead or missing."))
Using = FALSE
return
if(!user || !A || user.machine)
return
Expand Down

0 comments on commit 22867bd

Please sign in to comment.