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 all 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
2 changes: 1 addition & 1 deletion code/__DEFINES/weapon_stats.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ As such, don't expect any values assigned to common firearms to even consider ho
#define FIRE_DELAY_TIER_10 2.5
#define FIRE_DELAY_TIER_11 2
#define FIRE_DELAY_TIER_LMG 1.5
#define FIRE_DELAY_TIER_SG 1.5
#define FIRE_DELAY_TIER_SG 1.0
#define FIRE_DELAY_TIER_SMG 1.5
#define FIRE_DELAY_TIER_12 1

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)
new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(src)

/obj/structure/closet/secure_closet/smartgunner_forecon
Expand All @@ -161,8 +161,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)
new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(src)

/obj/structure/closet/cryo/Initialize()
Expand Down
6 changes: 5 additions & 1 deletion code/modules/admin/view_variables/modify_variables.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,11 +245,15 @@ GLOBAL_PROTECT(VVpixelmovement)

if("DELETE FROM LIST")
L.Cut(index, index+1)

var/temp_type = O.type

if (O)
if (O.vv_edit_var(objectvar, L))
to_chat(src, "Your edit was rejected by the object.", confidential = TRUE)
return
log_world("### ListVarEdit by [src]: [O.type] [objectvar]: REMOVED=[html_encode("[original_var]")]")

log_world("### ListVarEdit by [src]: [temp_type] [objectvar]: REMOVED=[html_encode("[original_var]")]")
log_admin("[key_name(src)] modified [original_name]'s [objectvar]: REMOVED=[original_var]")
message_admins("[key_name_admin(src)] modified [original_name]'s [objectvar]: REMOVED=[original_var]")
return
Expand Down
4 changes: 2 additions & 2 deletions code/modules/gear_presets/uscm_ship.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,8 +564,8 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/bridge(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_L_HAND)

/datum/equipment_preset/uscm_ship/so/load_status(mob/living/carbon/human/new_human, client/mob_client)
Expand Down
Loading