shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14253 from keronshb/eutactic_blade_restoration

Browse Source 
Hyperblade restored to uplink
This commit is contained in:
silicons
2021-02-22 13:10:21 -07:00
committed by GitHub
parent 150689c84a eb3299e969
commit 178fe9cf55
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/melee/energy.dm
+3 -1
View File
@@ -439,7 +439,9 @@
force_on = 15 //As strong a survival knife/bone dagger
/obj/item/melee/transforming/energy/sword/cx/attackby(obj/item/W, mob/living/user, params)
if(istype(W, /obj/item/melee/transforming/energy/sword/cx))
if(istype(W, /obj/item/melee/transforming/energy/sword/cx/traitor))
return
else if(istype(W, /obj/item/melee/transforming/energy/sword/cx))
if(HAS_TRAIT(W, TRAIT_NODROP) || HAS_TRAIT(src, TRAIT_NODROP))
to_chat(user, "<span class='warning'>\the [HAS_TRAIT(src, TRAIT_NODROP) ? src : W] is stuck to your hand, you can't attach it to \the [HAS_TRAIT(src, TRAIT_NODROP) ? W : src]!</span>")
return
code/modules/uplink/uplink_items/uplink_dangerous.dm
+12
View File
@@ -118,6 +118,18 @@
/datum/uplink_item/dangerous/doublesword/get_discount()
return pick(4;0.8,2;0.65,1;0.5)
/datum/uplink_item/dangerous/hyperblade
name = "Hypereutactic Blade"
desc = "The result of two Dragon Tooth swords combining, you wouldn't want to see this coming at you down the hall! \
Requires two hands to wield and it slows you down. You can also recolor it!"
item = /obj/item/dualsaber/hypereutactic
player_minimum = 25
cost = 16
exclude_modes = list(/datum/game_mode/nuclear/clown_ops, /datum/game_mode/traitor/internal_affairs)
/datum/uplink_item/dangerous/hyperblade/get_discount()
return pick(4;0.8,2;0.65,1;0.5)
/datum/uplink_item/dangerous/sword
name = "Energy Sword"
desc = "The energy sword is an edged weapon with a blade of pure energy. The sword is small enough to be \