mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-29 06:58:30 +01:00
Revert "Merge branch 'The-Model-E2' of https://github.com/klaasjared/VOREStation into The-Model-E2"
This reverts commit4431137791, reversing changes made to1806f4dc60.
This commit is contained in:
@@ -44,7 +44,6 @@
|
||||
damage = 30
|
||||
armor_penetration = 10
|
||||
|
||||
|
||||
/obj/item/projectile/beam/midlaser
|
||||
damage = 40
|
||||
armor_penetration = 10
|
||||
@@ -282,7 +281,6 @@
|
||||
damage = 5
|
||||
agony = 10
|
||||
|
||||
|
||||
//
|
||||
// Projectile Beam Definitions
|
||||
//
|
||||
@@ -300,3 +298,5 @@
|
||||
muzzle_type = /obj/effect/projectile/muzzle/pointdefense
|
||||
tracer_type = /obj/effect/projectile/tracer/pointdefense
|
||||
impact_type = /obj/effect/projectile/impact/pointdefense
|
||||
|
||||
|
||||
|
||||
@@ -50,6 +50,15 @@
|
||||
tracer_type = /obj/effect/projectile/tracer/laser_blue
|
||||
impact_type = /obj/effect/projectile/impact/laser_blue
|
||||
|
||||
/obj/item/projectile/beam/carbine/blue //double the damage of weaklaser
|
||||
damage = 30
|
||||
icon_state = "bluelaser"
|
||||
light_color = "#0066FF"
|
||||
|
||||
muzzle_type = /obj/effect/projectile/muzzle/laser_blue
|
||||
tracer_type = /obj/effect/projectile/tracer/laser_blue
|
||||
impact_type = /obj/effect/projectile/impact/laser_blue
|
||||
|
||||
/obj/item/projectile/beam/medigun
|
||||
name = "healing beam"
|
||||
icon_state = "healbeam"
|
||||
@@ -83,3 +92,5 @@
|
||||
M.adjustToxLoss(-5)
|
||||
M.adjustOxyLoss(-5)
|
||||
return 1
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user