mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Reverted r3944, with the exception of stock_parts.dmi
Fixed issue 605. Committing minor adjustments to watercloset.dm and paperbin.dm too! git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3947 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -7,11 +7,6 @@
|
||||
flag = "laser"
|
||||
eyeblur = 2
|
||||
|
||||
glowstr = 3
|
||||
sd_ColorBlue = 0.1
|
||||
sd_ColorGreen = 0.1
|
||||
sd_ColorRed = 0.7
|
||||
|
||||
/obj/item/projectile/practice
|
||||
name = "laser"
|
||||
icon_state = "laser"
|
||||
@@ -21,59 +16,33 @@
|
||||
flag = "laser"
|
||||
eyeblur = 2
|
||||
|
||||
glowstr = 3
|
||||
sd_ColorBlue = 0.1
|
||||
sd_ColorGreen = 0.1
|
||||
sd_ColorRed = 0.7
|
||||
|
||||
/obj/item/projectile/beam/heavylaser
|
||||
name = "heavy laser"
|
||||
icon_state = "heavylaser"
|
||||
damage = 40
|
||||
|
||||
glowstr = 4
|
||||
sd_ColorBlue = 0.1
|
||||
sd_ColorGreen = 0.1
|
||||
sd_ColorRed = 0.8
|
||||
|
||||
/obj/item/projectile/beam/xray
|
||||
name = "xray beam"
|
||||
icon_state = "xray"
|
||||
damage = 30
|
||||
|
||||
glowstr = 3
|
||||
sd_ColorBlue = 0.1
|
||||
sd_ColorGreen = 0.7
|
||||
sd_ColorRed = 0.1
|
||||
|
||||
/obj/item/projectile/beam/pulse
|
||||
name = "pulse"
|
||||
icon_state = "u_laser"
|
||||
damage = 50
|
||||
|
||||
glowstr = 4
|
||||
sd_ColorBlue = 0.9
|
||||
sd_ColorGreen = 0.2
|
||||
sd_ColorRed = 0.1
|
||||
|
||||
/obj/item/projectile/beam/deathlaser
|
||||
name = "death laser"
|
||||
icon_state = "heavylaser"
|
||||
damage = 60
|
||||
|
||||
glowstr = 4
|
||||
sd_ColorBlue = 0.1
|
||||
sd_ColorGreen = 0.1
|
||||
sd_ColorRed = 0.8
|
||||
|
||||
/obj/item/projectile/beam/emitter
|
||||
name = "emitter beam"
|
||||
icon_state = "emitter"
|
||||
|
||||
glowstr = 4
|
||||
sd_ColorBlue = 0.1
|
||||
sd_ColorGreen = 0.7
|
||||
sd_ColorRed = 0.2
|
||||
|
||||
|
||||
/obj/item/projectile/bluetag
|
||||
name = "lasertag beam"
|
||||
@@ -83,11 +52,6 @@
|
||||
damage_type = BURN
|
||||
flag = "laser"
|
||||
|
||||
glowstr = 3
|
||||
sd_ColorBlue = 0.7
|
||||
sd_ColorGreen = 0.1
|
||||
sd_ColorRed = 0.1
|
||||
|
||||
on_hit(var/atom/target, var/blocked = 0)
|
||||
if(istype(target, /mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/M = target
|
||||
@@ -103,11 +67,6 @@
|
||||
damage_type = BURN
|
||||
flag = "laser"
|
||||
|
||||
glowstr = 3
|
||||
sd_ColorBlue = 0.1
|
||||
sd_ColorGreen = 0.1
|
||||
sd_ColorRed = 0.7
|
||||
|
||||
on_hit(var/atom/target, var/blocked = 0)
|
||||
if(istype(target, /mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/M = target
|
||||
@@ -123,11 +82,6 @@
|
||||
damage_type = BURN
|
||||
flag = "laser"
|
||||
|
||||
glowstr = 3
|
||||
sd_ColorBlue = 0.9
|
||||
sd_ColorGreen = 0.3
|
||||
sd_ColorRed = 0.1
|
||||
|
||||
on_hit(var/atom/target, var/blocked = 0)
|
||||
if(istype(target, /mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/M = target
|
||||
|
||||
@@ -6,11 +6,6 @@
|
||||
nodamage = 1
|
||||
flag = "energy"
|
||||
|
||||
glowstr = 3
|
||||
sd_ColorBlue = 0.9
|
||||
sd_ColorGreen = 0.3
|
||||
sd_ColorRed = 0.1
|
||||
|
||||
on_hit(var/atom/change)
|
||||
wabbajack(change)
|
||||
|
||||
|
||||
@@ -14,11 +14,6 @@
|
||||
weaken = 10
|
||||
stutter = 10
|
||||
|
||||
glowstr = 2
|
||||
sd_ColorBlue = 0.1
|
||||
sd_ColorGreen = 0.5
|
||||
sd_ColorRed = 0.5
|
||||
|
||||
|
||||
/obj/item/projectile/energy/declone
|
||||
name = "declown"
|
||||
@@ -27,11 +22,6 @@
|
||||
damage_type = CLONE
|
||||
irradiate = 40
|
||||
|
||||
glowstr = 3
|
||||
sd_ColorBlue = 0.1
|
||||
sd_ColorGreen = 0.5
|
||||
sd_ColorRed = 0.1
|
||||
|
||||
|
||||
/obj/item/projectile/energy/dart
|
||||
name = "dart"
|
||||
|
||||
@@ -6,10 +6,6 @@
|
||||
nodamage = 1
|
||||
flag = "energy"
|
||||
|
||||
glowstr = 3
|
||||
sd_ColorBlue = 0.9
|
||||
sd_ColorGreen = 0.3
|
||||
sd_ColorRed = 0.1
|
||||
|
||||
on_hit(var/atom/target, var/blocked = 0)
|
||||
empulse(target, 1, 1)
|
||||
@@ -36,11 +32,6 @@
|
||||
flag = "energy"
|
||||
var/temperature = 300
|
||||
|
||||
glowstr = 3
|
||||
sd_ColorBlue = 0.9
|
||||
sd_ColorGreen = 0.3
|
||||
sd_ColorRed = 0.1
|
||||
|
||||
|
||||
on_hit(var/atom/target, var/blocked = 0)//These two could likely check temp protection on the mob
|
||||
if(istype(target, /mob/living))
|
||||
|
||||
Reference in New Issue
Block a user