diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 562af8c1a3..b5d88fe450 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -495,8 +495,7 @@ Difficulty: Very Hard NewTerrainChairs = /obj/structure/chair/wood NewTerrainTables = /obj/structure/table/wood NewFlora = list(/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/fernybush, /obj/structure/flora/ausbushes/leafybush, - /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/tree/palm, /mob/living/carbon/monkey, - /obj/item/weapon/gun/ballistic/bow, /obj/item/weapon/storage/backpack/quiver/full) + /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/tree/palm, /mob/living/carbon/monkey) florachance = 20 if("ayy lmao") //Beneficial, turns stuff into alien alloy which is useful to cargo and research. Also repairs atmos. NewTerrainFloors = /turf/open/floor/plating/abductor diff --git a/code/modules/projectiles/ammunition/caseless.dm b/code/modules/projectiles/ammunition/caseless.dm index 76861232b9..17693ae5e3 100644 --- a/code/modules/projectiles/ammunition/caseless.dm +++ b/code/modules/projectiles/ammunition/caseless.dm @@ -114,12 +114,3 @@ desc = "Whose smart idea was it to use toys as crowd control? Ages 18 and up." projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/riot icon_state = "foamdart_riot" - -/obj/item/ammo_casing/caseless/arrow - name = "arrow" - desc = "Stab, stab, stab." - icon_state = "arrow" - force = 10 - sharpness = IS_SHARP - projectile_type = /obj/item/projectile/bullet/reusable/arrow - caliber = "arrow" diff --git a/code/modules/projectiles/boxes_magazines/internal_mag.dm b/code/modules/projectiles/boxes_magazines/internal_mag.dm index 9476d728a6..3a8b4e6f2f 100644 --- a/code/modules/projectiles/boxes_magazines/internal_mag.dm +++ b/code/modules/projectiles/boxes_magazines/internal_mag.dm @@ -188,10 +188,3 @@ ammo_type = /obj/item/ammo_casing/caseless/laser/gatling caliber = "gatling" max_ammo = 5000 - - -/obj/item/ammo_box/magazine/internal/bow - name = "bow internal magazine" - ammo_type = /obj/item/ammo_casing/caseless/arrow - caliber = "arrow" - max_ammo = 1 diff --git a/code/modules/projectiles/guns/ballistic/bow.dm b/code/modules/projectiles/guns/ballistic/bow.dm deleted file mode 100644 index 89a5faa928..0000000000 --- a/code/modules/projectiles/guns/ballistic/bow.dm +++ /dev/null @@ -1,109 +0,0 @@ -/obj/item/weapon/gun/ballistic/bow - name = "bow" - desc = "A sturdy bow made out of wood and reinforced with iron." - icon_state = "bow_unloaded" - item_state = "bow" - var/icon_state_loaded = "bow_loaded" - var/icon_state_firing = "bow_firing" - var/item_state_loaded = "bow" - var/item_state_firing = "bow" - fire_sound = 'sound/weapons/grenadelaunch.ogg' - mag_type = /obj/item/ammo_box/magazine/internal/bow - weapon_weight = WEAPON_HEAVY - var/draw_sound = 'sound/weapons/draw_bow.ogg' - var/ready_to_fire = 0 - var/slowdown_when_ready = 2 - -/obj/item/weapon/gun/ballistic/bow/Initialize(mapload) - . = ..() - SET_SECONDARY_FLAG(src, SLOWS_WHILE_IN_HAND) - -/obj/item/weapon/gun/ballistic/bow/update_icon() - if(ready_to_fire) - icon_state = icon_state_firing - item_state = item_state_firing - slowdown = slowdown_when_ready - else if(magazine.ammo_count() && !ready_to_fire) - icon_state = icon_state_loaded - item_state = item_state_loaded - slowdown = initial(slowdown) - else - icon_state = initial(icon_state) - item_state = initial(item_state) - slowdown = initial(slowdown) - -/obj/item/weapon/gun/ballistic/bow/dropped(mob/user) - if(magazine && magazine.ammo_count()) - magazine.empty_magazine() - ready_to_fire = FALSE - update_icon() - -/obj/item/weapon/gun/ballistic/bow/attack_self(mob/living/user) - if(!ready_to_fire && magazine.ammo_count()) - ready_to_fire = TRUE - playsound(user, draw_sound, 100, 1) - update_icon() - else - ready_to_fire = FALSE - update_icon() - -/obj/item/weapon/gun/ballistic/bow/attackby(obj/item/A, mob/user, params) - var/num_loaded = magazine.attackby(A, user, params, 1) - if(num_loaded) - to_chat(user, "You ready \the [A] into \the [src].") - update_icon() - chamber_round() - -/obj/item/weapon/gun/ballistic/bow/can_shoot() - . = ..() - if(!ready_to_fire) - return FALSE - -/obj/item/weapon/gun/ballistic/bow/shoot_with_empty_chamber(mob/living/user as mob|obj) - return - -/obj/item/weapon/gun/ballistic/bow/process_chamber(eject_casing = 0, empty_chamber = 1) - . = ..() - ready_to_fire = FALSE - update_icon() - -// ammo -/obj/item/ammo_box/magazine/internal/bow - name = "bow internal magazine" - ammo_type = /obj/item/ammo_casing/caseless/arrow - caliber = "arrow" - max_ammo = 1 - - -/obj/item/projectile/bullet/reusable/arrow - name = "arrow" - icon_state = "arrow" - ammo_type = /obj/item/ammo_casing/caseless/arrow - range = 10 - damage = 25 - damage_type = BRUTE - -/obj/item/ammo_casing/caseless/arrow - name = "arrow" - desc = "Stab, stab, stab." - icon_state = "arrow" - force = 10 - sharpness = IS_SHARP - projectile_type = /obj/item/projectile/bullet/reusable/arrow - caliber = "arrow" - -//quiver -/obj/item/weapon/storage/backpack/quiver - name = "quiver" - desc = "A quiver for holding arrows." - icon_state = "quiver" - item_state = "quiver" - storage_slots = 20 - can_hold = list( - /obj/item/ammo_casing/caseless/arrow - ) - -/obj/item/weapon/storage/backpack/quiver/full/New() - ..() - for(var/i in 1 to storage_slots) - new /obj/item/ammo_casing/caseless/arrow(src) diff --git a/code/modules/projectiles/projectile/reusable.dm b/code/modules/projectiles/projectile/reusable.dm index 5d03806d39..9a2c12c03d 100644 --- a/code/modules/projectiles/projectile/reusable.dm +++ b/code/modules/projectiles/projectile/reusable.dm @@ -67,11 +67,3 @@ icon_state = "foamdart_riot_proj" ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot stamina = 25 - -/obj/item/projectile/bullet/reusable/arrow - name = "arrow" - icon_state = "arrow" - ammo_type = /obj/item/ammo_casing/caseless/arrow - range = 10 - damage = 25 - damage_type = BRUTE \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 173baf04fb..9cc65f7f46 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1972,7 +1972,6 @@ #include "code\modules\projectiles\guns\mounted.dm" #include "code\modules\projectiles\guns\syringe_gun.dm" #include "code\modules\projectiles\guns\ballistic\automatic.dm" -#include "code\modules\projectiles\guns\ballistic\bow.dm" #include "code\modules\projectiles\guns\ballistic\laser_gatling.dm" #include "code\modules\projectiles\guns\ballistic\launchers.dm" #include "code\modules\projectiles\guns\ballistic\pistol.dm"