cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

To make PsiOmegaDelta happy

Browse Source 
I hate this format.  Bluh bluh huge bitch
This commit is contained in:
SkyMarshal
2015-02-04 11:10:13 -07:00
committed by SkyMarshal
parent c8d6214657
commit a78ef81712
1 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,26 +246,26 @@ obj/item/weapon/gun/energy/staff/focus
charge_cost = 0 charge_cost = 0
silenced = 1 silenced = 1
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."
. = ..() . = ..()
update_icon() /obj/item/weapon/gun/energy/icarus/update_icon()
return return
verb/SetIcarusAngle() /obj/item/weapon/gun/energy/icarus/verb/SetIcarusAngle()
set src in usr set src in usr
set name = "Set Firing Angle" set name = "Set Firing Angle"
set desc = "Sets the angle from which the icarus will fire." set desc = "Sets the angle from which the icarus will fire."
set category = "Object" set category = "Object"
Icarus_SetPosition(usr) Icarus_SetPosition(usr)
/obj/item/weapon/gun/energy/variable /obj/item/weapon/gun/energy/variable
@@ -274,13 +274,12 @@ obj/item/weapon/gun/energy/staff/focus
charge_cost = 0 charge_cost = 0
silenced = 1 silenced = 1
update_icon() /obj/item/weapon/gun/energy/variable/update_icon()
return return
attack_self(mob/living/user as mob) /obj/item/weapon/gun/energy/variable/attack_self(mob/living/user as mob)
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]" . = ..()
. = ..()