cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small centcomm z-level fixes, fixex holodeck swords (#9734)

Browse Source
This commit is contained in:
fernerr
2020-08-21 14:41:50 +02:00
committed by GitHub
parent 12d8ca9885
commit da40ec6d32
3 changed files with 120 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holodeck/HolodeckObjects.dm
+9 -5
View File
@@ -243,6 +243,7 @@
no_attack_log = 1
/obj/item/holo/esword
name = "energy sword"
desc = "May the force be within you. Sorta."
icon = 'icons/obj/weapons.dmi'
icon_state = "sword0"
@@ -252,16 +253,18 @@
throwforce = 0
w_class = 2.0
flags = NOBLOODY
item_icons = list(
slot_l_hand_str = 'icons/mob/items/weapons/lefthand_energy.dmi',
slot_r_hand_str = 'icons/mob/items/weapons/righthand_energy.dmi'
)
var/active = 0
var/item_color
/obj/item/holo/esword/green
New()
item_color = "green"
item_color = "green"
/obj/item/holo/esword/red
New()
item_color = "red"
item_color = "red"
/obj/item/holo/esword/handle_shield(mob/user, var/on_back, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
if(active && default_parry_check(user, attacker, damage_source) && prob(50))
@@ -273,7 +276,8 @@
return 0
/obj/item/holo/esword/New()
item_color = pick("red","blue","green","purple")
if(!item_color)
item_color = pick("red","blue","green","purple")
/obj/item/holo/esword/attack_self(mob/living/user as mob)
active = !active