Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Biblically Accurate Smartguns #213

Merged
merged 12 commits into from
Apr 10, 2024
Merged

Biblically Accurate Smartguns #213

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9099487
Update special_ammo.dm
grifp71 Apr 4, 2024
5cb2751
Update backpack.dm
grifp71 Apr 4, 2024
77911a2
Update pouch.dm
grifp71 Apr 4, 2024
1e08a6f
Update ties.dm
grifp71 Apr 4, 2024
45fc100
Update job_closets.dm
grifp71 Apr 4, 2024
4d06d51
Update special_ammo.dm
grifp71 Apr 5, 2024
46f2310
fixes annoying VV bug
morrowwolf Apr 6, 2024
36c99dd
let's try this, may revert later
morrowwolf Apr 6, 2024
a47b637
Merge remote-tracking branch 'upstream/master' into pr/grifp71/213
morrowwolf Apr 6, 2024
58babee
woops
morrowwolf Apr 6, 2024
a5b4c65
kills space
morrowwolf Apr 6, 2024
f7e2f82
increase ROF, default damage
grifp71 Apr 8, 2024
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
6 changes: 4 additions & 2 deletions code/datums/ammo/bullet/special_ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,19 @@

max_range = 12
accuracy = HIT_ACCURACY_TIER_4
damage = 36
damage = 65
penetration = 0
damage_falloff = DAMAGE_FALLOFF_TIER_7

/datum/ammo/bullet/smartgun/armor_piercing
name = "armor-piercing smartgun bullet"
icon_state = "bullet"

accurate_range = 12
accuracy = HIT_ACCURACY_TIER_2
damage = 24
damage = 55
penetration = ARMOR_PENETRATION_TIER_8
damage_falloff = DAMAGE_FALLOFF_TIER_7
damage_armor_punch = 1

/datum/ammo/bullet/smartgun/dirty
morrowwolf marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/storage/backpack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,7 @@
w_class = SIZE_LARGE
max_w_class = SIZE_MEDIUM
flags_equip_slot = SLOT_WAIST
cant_hold = list(/obj/item/ammo_magazine/smartgun)
icon = 'icons/obj/items/clothing/belts.dmi'
icon_state = "g8pouch"
item_state = "g8pouch"
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/storage/pouch.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
/obj/item/storage/firstaid,
/obj/item/storage/bible,
/obj/item/storage/box,
/obj/item/ammo_magazine/smartgun,
)
storage_slots = null
max_storage_space = 2
Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/structures/crates_lockers/closets/job_closets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/storage/belt/marine/smartgunner(src)
new /obj/item/storage/belt/gun/smartgunner(src)
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/ammo_magazine/smartgun(src)

/obj/structure/closet/secure_closet/smartgunner_forecon
name = "smartgunner locker"
Expand All @@ -160,8 +160,8 @@
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/storage/belt/marine/smartgunner/standard(src)
new /obj/item/storage/belt/gun/smartgunner/standard(src)
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/ammo_magazine/smartgun(src)

/obj/structure/closet/cryo/Initialize()
. = ..()
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/under/ties.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,6 +777,7 @@
/obj/item/storage/firstaid,
/obj/item/storage/bible,
/obj/item/storage/toolkit,
/obj/item/ammo_magazine/smartgun,
)
storage_flags = NONE //no verb, no quick draw, no tile gathering

Expand Down
Loading