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

here we go again (#2456)

Browse Source
This commit is contained in:
LetterJay
2017-08-24 21:24:25 -05:00
committed by kevinz000
parent c7ed043fd5
commit 188193eb61
1107 changed files with 25420 additions and 25417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holodeck/items.dm
+12 -12
View File
@@ -7,10 +7,10 @@
// Items
//
/obj/item/weapon/holo
/obj/item/holo
damtype = STAMINA
/obj/item/weapon/holo/esword
/obj/item/holo/esword
name = "holographic energy sword"
desc = "May the force be with you. Sorta"
icon_state = "sword0"
@@ -25,28 +25,28 @@
armour_penetration = 50
var/active = 0
/obj/item/weapon/holo/esword/green/New()
/obj/item/holo/esword/green/New()
..()
item_color = "green"
/obj/item/weapon/holo/esword/red/New()
/obj/item/holo/esword/red/New()
..()
item_color = "red"
/obj/item/weapon/holo/esword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
/obj/item/holo/esword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
if(active)
return ..()
return 0
/obj/item/weapon/holo/esword/attack(target as mob, mob/user as mob)
/obj/item/holo/esword/attack(target as mob, mob/user as mob)
..()
/obj/item/weapon/holo/esword/New()
/obj/item/holo/esword/New()
item_color = pick("red","blue","green","purple")
..()
/obj/item/weapon/holo/esword/attack_self(mob/living/user as mob)
/obj/item/holo/esword/attack_self(mob/living/user as mob)
active = !active
if (active)
force = 30
@@ -102,7 +102,7 @@
anchored = TRUE
density = TRUE
/obj/structure/holohoop/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/structure/holohoop/attackby(obj/item/W as obj, mob/user as mob, params)
if(get_dist(src,user)<2)
if(user.drop_item(src))
visible_message("<span class='warning'> [user] dunks [W] into \the [src]!</span>")
@@ -163,7 +163,7 @@
to_chat(user, "<span class='warning'>You are too primitive to use this device!</span>")
return
/obj/machinery/readybutton/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/obj/machinery/readybutton/attackby(obj/item/W as obj, mob/user as mob, params)
to_chat(user, "The device is a solid button, there's nothing you can do with it!")
/obj/machinery/readybutton/attack_hand(mob/user as mob)
@@ -218,10 +218,10 @@
else
return ..()
/obj/item/weapon/paper/fluff/holodeck/trek_diploma
/obj/item/paper/fluff/holodeck/trek_diploma
name = "paper - Starfleet Academy Diploma"
info = {"<h2>Starfleet Academy</h2></br><p>Official Diploma</p></br>"}
/obj/item/weapon/paper/fluff/holodeck/disclaimer
/obj/item/paper/fluff/holodeck/disclaimer
name = "Holodeck Disclaimer"
info = "Brusies sustained in the holodeck can be healed simply by sleeping."