Skip to content

Commit

Permalink
RCD fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
EgorDinamit committed Feb 14, 2024
1 parent f4f2dd3 commit 57ed5cc
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions code/game/objects/items/weapons/RCD.dm
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,11 @@
spark_system.start()

/obj/item/rcd/afterattack(atom/A, mob/user, proximity)
if(!proximity)
return
var/turf/T = get_turf(A)
if(!can_use(user, T))
return FALSE
if(disabled && !isrobot(user))
return 0
if(istype(get_area(A), /area/shuttle) || istype(get_area(A), /turf/space/transit))
return 0
return FALSE
work_id++
work_mode.do_work(src, A, user)

Expand Down Expand Up @@ -184,15 +183,18 @@
max_stored_matter = 240
build_speed_multiplier = 0.75

// Super-fast RCD for memes and admemes. Don't actually spawn this menace.
// Super-fast ranged RCD for memes and admemes. Don't actually spawn this menace.
/obj/item/rcd/improved/admin
name = "rapid-rapid construction device"
desc = "Device that manifests or destroys buildings in an instant. Where did you get this from?"
origin_tech = list(TECH_ENGINEERING = 10, TECH_MATERIAL = 8)
name = "rapid-rapid bluespace construction device"
desc = "Device that manifests or destroys buildings in an instant at any distance. Where did you get this from?"
origin_tech = list(TECH_ENGINEERING = 20, TECH_MATERIAL = 18)
matter = list(MATERIAL_STEEL = 75000, MATERIAL_SILVER = 15000)
max_stored_matter = 480
build_speed_multiplier = 0.1

/obj/item/rcd/improved/admin/can_use(mob/user, turf/T)
return (user.get_active_hand() == src && !user.incapacitated())

/*** RCD ammo ***/
/obj/item/rcd_ammo
name = "compressed matter cartridge"
Expand Down

0 comments on commit 57ed5cc

Please sign in to comment.