cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-07-17 11:13:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rebase issues

Browse Source
This commit is contained in:
atermonera
2022-04-17 19:18:15 -08:00
parent 7c807a2f90
commit fec412daaa
8 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/launcher/bows.dm
+22 -22
View File
@@ -1,4 +1,4 @@
/obj/item/weapon/arrow/wood
/obj/item/arrow/wood
name = "wooden arrow"
desc = "A wooden arrow with a stone tip. Simple, but gets the job done."
icon = 'icons/obj/weapons.dmi'
@@ -12,7 +12,7 @@
pickup_sound = 'sound/items/pickup/woodweapon.ogg'
/obj/item/weapon/arrow/energy
/obj/item/arrow/energy
name = "hardlight arrow"
desc = "An arrow made out of energy! Classic?"
icon = 'icons/obj/weapons.dmi'
@@ -25,17 +25,17 @@
embed_chance = 0
catchable = FALSE // no catching energy
/obj/item/weapon/arrow/energy/throw_impact(atom/hit_atom)
/obj/item/arrow/energy/throw_impact(atom/hit_atom)
. = ..()
qdel(src)
/obj/item/weapon/arrow/energy/equipped()
/obj/item/arrow/energy/equipped()
if(isliving(loc))
var/mob/living/L = loc
L.drop_from_inventory(src)
qdel(src)
/obj/item/weapon/gun/launcher/crossbow/bow
/obj/item/gun/launcher/crossbow/bow
name = "shortbow"
desc = "A common shortbow, capable of firing arrows at high speed towards a target. Useful for hunting while keeping quiet."
icon = 'icons/obj/weapons.dmi'
@@ -53,37 +53,37 @@
pickup_sound = 'sound/items/pickup/woodweapon.ogg'
/obj/item/weapon/gun/launcher/crossbow/bow/update_release_force(obj/item/projectile)
/obj/item/gun/launcher/crossbow/bow/update_release_force(obj/item/projectile)
return 0
/obj/item/weapon/gun/launcher/crossbow/bow/proc/unload(mob/user)
var/obj/item/weapon/arrow/A = bolt
/obj/item/gun/launcher/crossbow/bow/proc/unload(mob/user)
var/obj/item/arrow/A = bolt
bolt = null
drawn = FALSE
A.forceMove(get_turf(user))
user.put_in_hands(A)
update_icon()
/obj/item/weapon/gun/launcher/crossbow/bow/consume_next_projectile(mob/user)
/obj/item/gun/launcher/crossbow/bow/consume_next_projectile(mob/user)
if(!drawn)
to_chat(user, "<span class='warning'>\The [src] is not drawn back!</span>")
return null
return bolt
/obj/item/weapon/gun/launcher/crossbow/bow/handle_post_fire(mob/user, atom/target)
/obj/item/gun/launcher/crossbow/bow/handle_post_fire(mob/user, atom/target)
bolt = null
drawn = FALSE
update_icon()
..()
/obj/item/weapon/gun/launcher/crossbow/bow/attack_hand(mob/living/user)
/obj/item/gun/launcher/crossbow/bow/attack_hand(mob/living/user)
if(loc == user && bolt && !drawn)
user.visible_message("<b>[user]</b> removes [bolt] from [src].","You remove [bolt] from [src].")
unload(user)
else
return ..()
/obj/item/weapon/gun/launcher/crossbow/bow/attack_self(mob/living/user)
/obj/item/gun/launcher/crossbow/bow/attack_self(mob/living/user)
if(drawn)
user.visible_message("<b>[user]</b> relaxes the tension on [src]'s string.","You relax the tension on [src]'s string.")
drawn = FALSE
@@ -91,7 +91,7 @@
else
draw(user)
/obj/item/weapon/gun/launcher/crossbow/bow/draw(var/mob/user)
/obj/item/gun/launcher/crossbow/bow/draw(var/mob/user)
if(!bolt)
to_chat(user, "You don't have anything nocked to [src].")
return
@@ -106,17 +106,17 @@
user.visible_message("<b>[user]</b> draws the string on [src] back fully!", "You draw the string on [src] back fully!")
update_icon()
/obj/item/weapon/gun/launcher/crossbow/bow/handle_click_empty(mob/user)
/obj/item/gun/launcher/crossbow/bow/handle_click_empty(mob/user)
return
/obj/item/weapon/gun/launcher/crossbow/bow/attackby(obj/item/W as obj, mob/user)
if(!bolt && istype(W,/obj/item/weapon/arrow/wood))
/obj/item/gun/launcher/crossbow/bow/attackby(obj/item/W as obj, mob/user)
if(!bolt && istype(W,/obj/item/arrow/wood))
user.drop_from_inventory(W, src)
bolt = W
user.visible_message("[user] nocks [bolt] in [src].","You nock [bolt] in [src].")
update_icon()
/obj/item/weapon/gun/launcher/crossbow/bow/update_icon()
/obj/item/gun/launcher/crossbow/bow/update_icon()
if(drawn)
icon_state = "[initial(icon_state)]_firing"
else if(bolt)
@@ -124,14 +124,14 @@
else
icon_state = "[initial(icon_state)]"
/obj/item/weapon/gun/launcher/crossbow/bow/dropped(mob/user)
/obj/item/gun/launcher/crossbow/bow/dropped(mob/user)
if(drawn)
to_chat(user, "<span class='warning'>\The [src]'s tension is relaxed as you let go of it!</span>")
drawn = FALSE
update_icon()
/obj/item/weapon/gun/launcher/crossbow/bow/hardlight
/obj/item/gun/launcher/crossbow/bow/hardlight
name = "hardlight bow"
icon_state = "bow_hardlight"
item_state = "bow_hardlight"
@@ -139,18 +139,18 @@
drop_sound = 'sound/items/drop/gun.ogg'
pickup_sound = 'sound/items/pickup/gun.ogg'
/obj/item/weapon/gun/launcher/crossbow/bow/hardlight/unload(mob/user)
/obj/item/gun/launcher/crossbow/bow/hardlight/unload(mob/user)
qdel_null(bolt)
update_icon()
/obj/item/weapon/gun/launcher/crossbow/bow/hardlight/attack_self(mob/living/user)
/obj/item/gun/launcher/crossbow/bow/hardlight/attack_self(mob/living/user)
if(drawn)
user.visible_message("<b>[user]</b> relaxes the tension on [src]'s string.","You relax the tension on [src]'s string.")
drawn = FALSE
update_icon()
else if(!bolt)
user.visible_message("<b>[user]</b> fabricates a new hardlight projectile with [src].","You fabricate a new hardlight projectile with [src].")
bolt = new /obj/item/weapon/arrow/energy(src)
bolt = new /obj/item/arrow/energy(src)
update_icon()
else
draw(user)