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

More updates

Browse Source
This commit is contained in:
Unknown
2019-12-06 18:24:18 -05:00
parent a3c48e6eca
commit d8392dfe8b
3 changed files with 27 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
code/game/objects/items/weapons/melee/energy.dm
View File

@@ -23,6 +23,26 @@
slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
)
/obj/item/weapon/melee/energy/sword/green/New()
colorable = FALSE
lcolor = "#008000"
/obj/item/weapon/melee/energy/sword/red/New()
colorable = FALSE
lcolor = "#FF0000"
/obj/item/weapon/melee/energy/sword/blue/New()
colorable = FALSE
lcolor = "#0000FF"
/obj/item/weapon/melee/energy/sword/purple/New()
colorable = FALSE
lcolor = "#800080"
/obj/item/weapon/melee/energy/sword/white/New()
colorable = FALSE
lcolor = "#FFFFFF"
/obj/item/weapon/melee/energy/proc/activate(mob/living/user)
if(active)
return
@@ -147,11 +167,12 @@
/obj/item/weapon/melee/energy/update_icon()
. = ..()
var/mutable_appearance/blade_overlay = mutable_appearance(icon, "[icon_state]_blade")
if(colorable)
blade_overlay.color = lcolor
if(rainbow || !colorable)
color = lcolor
if(rainbow)
blade_overlay = mutable_appearance(icon, "[icon_state]_blade_rainbow")
blade_overlay.color = "FFFFFF"
color = "FFFFFF"
cut_overlays() //So that it doesn't keep stacking overlays non-stop on top of each other
if(active)
add_overlay(blade_overlay)

15
code/game/objects/items/weapons/melee/energy_vr.dm
View File

@@ -8,18 +8,3 @@
/obj/item/weapon/melee/energy/sword/imperial/activate(mob/living/user)
..()
icon_state = "sword1"
/obj/item/weapon/melee/energy/sword/green/New()
lcolor = "#008000"
/obj/item/weapon/melee/energy/sword/red/New()
lcolor = "#FF0000"
/obj/item/weapon/melee/energy/sword/blue/New()
lcolor = "#0000FF"
/obj/item/weapon/melee/energy/sword/purple/New()
lcolor = "#800080"
/obj/item/weapon/melee/energy/sword/white/New()
lcolor = "#FFFFFF"

24
code/modules/holodeck/HolodeckObjects.dm
View File

@@ -279,12 +279,10 @@ datum/unarmed_attack/holopugilism/unarmed_override(var/mob/living/carbon/human/u
flags = NOBLOODY
var/active = 0
/obj/item/weapon/holo/esword/green
New()
/obj/item/weapon/holo/esword/green/New()
lcolor = "#008000"
/obj/item/weapon/holo/esword/red
New()
/obj/item/weapon/holo/esword/red/New()
lcolor = "#FF0000"
/obj/item/weapon/holo/esword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
@@ -339,24 +337,6 @@ datum/unarmed_attack/holopugilism/unarmed_override(var/mob/living/carbon/human/u
H.update_inv_l_hand()
H.update_inv_r_hand()
/obj/item/weapon/holo/esword/AltClick(mob/living/user)
if(!in_range(src, user)) //Basic checks to prevent abuse
return
if(user.incapacitated() || !istype(user))
to_chat(user, "<span class='warning'>You can't do that right now!</span>")
return
if(alert("Are you sure you want to recolor your blade?", "Confirm Recolor", "Yes", "No") == "Yes")
var/energy_color_input = input(usr,"","Choose Energy Color",lcolor) as color|null
if(energy_color_input)
lcolor = sanitize_hexcolor(energy_color_input)
update_icon()
/obj/item/weapon/holo/esword/examine(mob/user)
..()
to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
//BASKETBALL OBJECTS
/obj/item/weapon/beach_ball/holoball