cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 06:22:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Point Verdant Delivery Points + Long Range Holopad in Cells + Konyang Police Fax + Police Speedloader fix + L + Ratio (#18531)

Browse Source 
* Point Verdant Deliveries

* Holopad Police

* Refactor code

* Variables applied

* Spawn Limits

* nicer

* Fix bug (hopefully)

* Document

* Maptweaks + bugfix

* spell

* typo

* Bugfix

* no spaces

* Extra Document

* oops

---------

Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
This commit is contained in:
Ben
2024-02-29 17:39:10 +00:00
committed by GitHub
co-authored by Ben10083
parent 59c9f88655
commit 2977912fbe
8 changed files with 150 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition.dm
+6 -3
View File
@@ -108,15 +108,18 @@
var/caliber = "357"
var/max_ammo = 7
var/ammo_type = /obj/item/ammo_casing //ammo type that is initially loaded
/// Ammo type that is initially loaded
var/ammo_type = /obj/item/ammo_casing
var/initial_ammo = null
var/multiple_sprites = 0
var/multiple_sprites = FALSE
//because BYOND doesn't support numbers as keys in associative lists
var/list/icon_keys = list() //keys
var/list/ammo_states = list() //values
var/insert_sound = /singleton/sound_category/metal_slide_reload //sound it plays when it gets inserted into a gun.
/// sound item plays when it is inserted into a gun.
var/insert_sound = /singleton/sound_category/metal_slide_reload
/// sound item plays when it is ejected from a gun.
var/eject_sound = 'sound/weapons/magazine_eject.ogg'
/obj/item/ammo_magazine/Initialize()
code/modules/projectiles/ammunition/boxes.dm
+5 -3
View File
@@ -7,7 +7,7 @@
ammo_type = /obj/item/ammo_casing/a357
matter = list(DEFAULT_WALL_MATERIAL = 1260)
max_ammo = 8
multiple_sprites = 1
multiple_sprites = TRUE
/obj/item/ammo_magazine/a454
name = "speed loader (.454)"
@@ -17,7 +17,7 @@
ammo_type = /obj/item/ammo_casing/a454
matter = list(DEFAULT_WALL_MATERIAL = 1260)
max_ammo = 7
multiple_sprites = 1
multiple_sprites = TRUE
/obj/item/ammo_magazine/c38
name = "speed loader (.38)"
@@ -27,7 +27,7 @@
matter = list(DEFAULT_WALL_MATERIAL = 360)
ammo_type = /obj/item/ammo_casing/c38
max_ammo = 6
multiple_sprites = 1
multiple_sprites = TRUE
/obj/item/ammo_magazine/c38/rubber
name = "speed loader (.38 rubber)"
@@ -43,6 +43,8 @@
icon_state = "a454"
caliber = ".45"
ammo_type = /obj/item/ammo_casing/c45/revolver
max_ammo = 6
multiple_sprites = TRUE
// End of Revolvos //