Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/projectiles/boxes_magazines/internal/rifle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
ammo_type = /obj/item/ammo_casing/rebar

/obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/syndie
max_ammo = 3
max_ammo = 6
caliber = CALIBER_REBAR
ammo_type = /obj/item/ammo_casing/rebar/syndie

6 changes: 3 additions & 3 deletions code/modules/projectiles/guns/ballistic/rifle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
fire_sound = 'sound/items/xbow_lock.ogg'
can_be_sawn_off = FALSE
tac_reloads = FALSE
var/draw_time = 3 SECONDS
var/draw_time = 2.5 SECONDS
SET_BASE_PIXEL(0, 0)

/obj/item/gun/ballistic/rifle/rebarxbow/rack(mob/user = null)
Expand Down Expand Up @@ -273,7 +273,7 @@
desc = "Some idiot decided that they would risk shooting themselves in the face if it meant they could have a draw this crossbow a bit faster. Hopefully, it was worth it."
// Feel free to add a recipe to allow you to change it back if you would like, I just wasn't sure if you could have two recipes for the same thing.
can_misfire = TRUE
draw_time = 1.5
draw_time = 1
misfire_probability = 25
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/force

Expand All @@ -286,7 +286,7 @@
worn_icon_state = "rebarxbowsyndie"
w_class = WEIGHT_CLASS_NORMAL
initial_caliber = CALIBER_REBAR
draw_time = 1
draw_time = 0.5
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/syndie

/obj/item/gun/ballistic/rifle/rebarxbow/syndie/Initialize(mapload)
Expand Down
19 changes: 10 additions & 9 deletions code/modules/projectiles/projectile/bullets/rifle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@
/obj/projectile/bullet/rebar
name = "rebar"
icon_state = "rebar"
damage = 30
damage = 25
speed = 2.5
dismemberment = 1 //because a 1 in 100 chance to just blow someones arm off is enough to be cool but also not enough to be reliable
armour_penetration = 10
wound_bonus = -20
wound_bonus = 5
bare_wound_bonus = 20
embed_type = /datum/embedding/rebar
embed_falloff_tile = -5
wound_falloff_tile = -2
wound_falloff_tile = 0
shrapnel_type = /obj/item/ammo_casing/rebar

/datum/embedding/rebar
Expand All @@ -92,12 +92,13 @@
/obj/projectile/bullet/rebar/syndie
name = "rebar"
icon_state = "rebar"
damage = 45
dismemberment = 2 //It's a budget sniper rifle.
armour_penetration = 20 //A bit better versus armor. Gets past anti laser armor or a vest, but doesnt wound proc on sec armor.
wound_bonus = 10
bare_wound_bonus = 20
embed_falloff_tile = -3
damage = 50
dismemberment = 5 //It's a budget sniper rifle.
armour_penetration = 30
wound_bonus = 40 // lets just WOUND
bare_wound_bonus = 0
embed_falloff_tile = 0 // BONK!
accurate_range = 250 // cuz i wanna snipoor
embed_type = /datum/embedding/rebar_syndie
shrapnel_type = /obj/item/ammo_casing/rebar/syndie

Expand Down
4 changes: 2 additions & 2 deletions code/modules/uplink/uplink_items/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@

/datum/uplink_item/role_restricted/rebarxbowsyndie
name = "Syndicate Rebar Crossbow"
desc = "A much more professional version of the engineer's bootleg rebar crossbow. 3 shot mag, quicker loading, and better ammo. Owners manual included."
desc = "A much more professional version of the engineer's bootleg rebar crossbow. 6 shot mag, quicker loading, and better ammo. Owners manual included."
item = /obj/item/storage/box/syndie_kit/rebarxbowsyndie
cost = 12
cost = 13
restricted_roles = list(JOB_STATION_ENGINEER, JOB_CHIEF_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN)

/datum/uplink_item/role_restricted/magillitis_serum
Expand Down