cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes errors in energy/special.dm

Browse Source
This commit is contained in:
SkyMarshal
2015-02-15 10:45:34 -07:00
parent ad24aa8e47
commit 03e8acd957
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/projectiles/guns/energy/special.dm
View File

@@ -160,7 +160,7 @@ obj/item/weapon/gun/energy/staff/focus
/obj/item/weapon/gun/energy/icarus /obj/item/weapon/gun/energy/icarus
name = "rubber ducky" name = "rubber ducky"
desc = "It's a cute rubber duck. With an evil gleam in it's eye." desc = "It's a cute rubber duck. With an evil gleam in it's eye."
projectile_type = "/obj/item/projectile/icarus/pointdefense" projectile_type = /obj/item/projectile/icarus/pointdefense
icon = 'icons/obj/watercloset.dmi' icon = 'icons/obj/watercloset.dmi'
icon_state = "rubberducky" icon_state = "rubberducky"
item_state = "rubberducky" item_state = "rubberducky"
@@ -168,11 +168,11 @@ obj/item/weapon/gun/energy/staff/focus
silenced = 1 silenced = 1
/obj/item/weapon/gun/energy/icarus/attack_self(mob/living/user as mob) /obj/item/weapon/gun/energy/icarus/attack_self(mob/living/user as mob)
if(projectile_type == "/obj/item/projectile/icarus/pointdefense") if(projectile_type == /obj/item/projectile/icarus/pointdefense)
projectile_type = "/obj/item/projectile/icarus/guns" projectile_type = /obj/item/projectile/icarus/guns
user << "You inform the Icarus to switch to the main guns." user << "You inform the Icarus to switch to the main guns."
else else
projectile_type = "/obj/item/projectile/icarus/pointdefense" projectile_type = /obj/item/projectile/icarus/pointdefense
user << "You inform the Icarus to switch to the point-defense lasers." user << "You inform the Icarus to switch to the point-defense lasers."
. = ..() . = ..()
@@ -202,5 +202,5 @@ obj/item/weapon/gun/energy/staff/focus
var/type = input(user,"What projectile type?","Projectile", null) as null|anything in typesof(/obj/item/projectile) var/type = input(user,"What projectile type?","Projectile", null) as null|anything in typesof(/obj/item/projectile)
if(!type) if(!type)
return ..() return ..()
projectile_type = type
. = ..() . = ..()