mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-17 02:47:58 +01:00
Adds Armor-Piercing 9mm Magazines to the game (#20815)
-Adds Armor Piercing 9mm Ammo along with Pistol Magazines for it. -It currently deals 12 damage and has 30 Armor-Penetration, allowing it to deal more damage than .45 to armored opponents however it struggles against unarmoured targets due to it's low damage output Only available on the Antagonist Uplinks for now.  --------- Signed-off-by: Birigilis <kavbest10@gmail.com> Signed-off-by: Matt Atlas <mattiathebest2000@hotmail.it> Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it> Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
This commit is contained in:
@@ -8,7 +8,12 @@
|
||||
/datum/uplink_item/item/ammo/mc9mm
|
||||
name = "9mm Magazine"
|
||||
path = /obj/item/ammo_magazine/mc9mm
|
||||
desc = "Contains ten rounds of 9mm bullets."
|
||||
desc = "Contains twelve rounds of 9mm bullets."
|
||||
|
||||
/datum/uplink_item/item/ammo/mc9mm/polymer
|
||||
name = "AP 9mm Magazine"
|
||||
path = /obj/item/ammo_magazine/mc9mm/polymer
|
||||
desc = "Contains twelve rounds of armor-piercing 9mm bullets."
|
||||
|
||||
/datum/uplink_item/item/ammo/darts
|
||||
name = "Chemical Darts"
|
||||
@@ -18,7 +23,7 @@
|
||||
/datum/uplink_item/item/ammo/fourty_five
|
||||
name = ".45 Pistol Magazine"
|
||||
path = /obj/item/ammo_magazine/c45m
|
||||
desc = "Contains seven rounds of .45 bullets."
|
||||
desc = "Contains nine rounds of .45 bullets."
|
||||
|
||||
/datum/uplink_item/item/ammo/submachinegundrum
|
||||
name = "Submachine Gun Drum Magazine (.45)"
|
||||
|
||||
@@ -212,6 +212,15 @@
|
||||
/obj/item/ammo_magazine/mc9mm/empty
|
||||
initial_ammo = 0
|
||||
|
||||
/obj/item/ammo_magazine/mc9mm/polymer
|
||||
name = "magazine (9mm polymer)"
|
||||
icon_state = "9x19AP"
|
||||
mag_type = MAGAZINE
|
||||
caliber = "9mm"
|
||||
ammo_type = /obj/item/ammo_casing/c9mm/polymer
|
||||
max_ammo = 12
|
||||
multiple_sprites = 1
|
||||
|
||||
/obj/item/ammo_magazine/mc9mm/flash
|
||||
name = "magazine (9mm flash)"
|
||||
ammo_type = /obj/item/ammo_casing/c9mm/flash
|
||||
|
||||
@@ -47,6 +47,12 @@
|
||||
caliber = "trod"
|
||||
projectile_type = /obj/projectile/bullet/trod
|
||||
|
||||
/obj/item/ammo_casing/c9mm/polymer
|
||||
desc = "A 9mm polymer bullet casing."
|
||||
caliber = "9mm"
|
||||
projectile_type = /obj/projectile/bullet/pistol/polymer
|
||||
max_stack = 15
|
||||
|
||||
/obj/item/ammo_casing/c9mm
|
||||
desc = "A 9mm bullet casing."
|
||||
caliber = "9mm"
|
||||
|
||||
@@ -181,6 +181,10 @@
|
||||
damage = 20
|
||||
armor_penetration = 15
|
||||
|
||||
/obj/projectile/bullet/pistol/polymer
|
||||
damage = 12
|
||||
armor_penetration = 30
|
||||
|
||||
/obj/projectile/bullet/pistol/medium
|
||||
damage = 30
|
||||
armor_penetration = 0
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# - (fixes bugs)
|
||||
# wip
|
||||
# - (work in progress)
|
||||
# qol
|
||||
# - (quality of life)
|
||||
# soundadd
|
||||
# - (adds a sound)
|
||||
# sounddel
|
||||
# - (removes a sound)
|
||||
# rscadd
|
||||
# - (adds a feature)
|
||||
# rscdel
|
||||
# - (removes a feature)
|
||||
# imageadd
|
||||
# - (adds an image or sprite)
|
||||
# imagedel
|
||||
# - (removes an image or sprite)
|
||||
# spellcheck
|
||||
# - (fixes spelling or grammar)
|
||||
# experiment
|
||||
# - (experimental change)
|
||||
# balance
|
||||
# - (balance changes)
|
||||
# code_imp
|
||||
# - (misc internal code change)
|
||||
# refactor
|
||||
# - (refactors code)
|
||||
# config
|
||||
# - (makes a change to the config files)
|
||||
# admin
|
||||
# - (makes changes to administrator tools)
|
||||
# server
|
||||
# - (miscellaneous changes to server)
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: Baldos
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
|
||||
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- rscadd: "Added Armor-Piericing 9mm Pistol Magazines, currently only available on Antagonist Uplinks."
|
||||
- spellcheck: "Fixed the Incorrect number of rounds in a magazine that the Uplink displays for both .45 and 9mm."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 46 KiB |
Reference in New Issue
Block a user