cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-28 11:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Singletons + refactor of /datum/observ (#15487)

Browse Source
This commit is contained in:
Fluffy
2023-01-05 18:41:40 +01:00
committed by GitHub
parent 95f8207f08
commit 0ddcf0817a
507 changed files with 7603 additions and 7214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
code/modules/projectiles/ammunition/boxes.dm
View File

@@ -3,7 +3,7 @@
name = "speed loader (.357)"
icon_state = "T38"
caliber = "357"
insert_sound = /decl/sound_category/revolver_reload
insert_sound = /singleton/sound_category/revolver_reload
ammo_type = /obj/item/ammo_casing/a357
matter = list(DEFAULT_WALL_MATERIAL = 1260)
max_ammo = 8
@@ -13,7 +13,7 @@
name = "speed loader (.454)"
icon_state = "a454"
caliber = "454"
insert_sound = /decl/sound_category/revolver_reload
insert_sound = /singleton/sound_category/revolver_reload
ammo_type = /obj/item/ammo_casing/a454
matter = list(DEFAULT_WALL_MATERIAL = 1260)
max_ammo = 7
@@ -23,7 +23,7 @@
name = "speed loader (.38)"
icon_state = "38"
caliber = "38"
insert_sound = /decl/sound_category/revolver_reload
insert_sound = /singleton/sound_category/revolver_reload
matter = list(DEFAULT_WALL_MATERIAL = 360)
ammo_type = /obj/item/ammo_casing/c38
max_ammo = 6
@@ -188,7 +188,7 @@
origin_tech = list(TECH_COMBAT = 2)
matter = list(DEFAULT_WALL_MATERIAL = 1800)
caliber = "9mm"
insert_sound = /decl/sound_category/polymer_slide_reload
insert_sound = /singleton/sound_category/polymer_slide_reload
ammo_type = /obj/item/ammo_casing/c9mm
max_ammo = 30
@@ -202,7 +202,7 @@
ammo_type = /obj/item/ammo_casing/c9mm
matter = list(DEFAULT_WALL_MATERIAL = 1200)
caliber = "9mm"
insert_sound = /decl/sound_category/polymer_slide_reload
insert_sound = /singleton/sound_category/polymer_slide_reload
max_ammo = 20
multiple_sprites = 1
@@ -235,7 +235,7 @@
origin_tech = list(TECH_COMBAT = 2)
mag_type = MAGAZINE
caliber = "10mm"
insert_sound = /decl/sound_category/polymer_slide_reload
insert_sound = /singleton/sound_category/polymer_slide_reload
matter = list(DEFAULT_WALL_MATERIAL = 1500)
ammo_type = /obj/item/ammo_casing/c10mm
max_ammo = 20
@@ -252,7 +252,7 @@
matter = list(DEFAULT_WALL_MATERIAL = 1200)
caliber = ".45"
max_ammo = 16
insert_sound = /decl/sound_category/polymer_slide_reload
insert_sound = /singleton/sound_category/polymer_slide_reload
multiple_sprites = 1
/obj/item/ammo_magazine/c45uzi/empty
@@ -265,7 +265,7 @@
ammo_type = /obj/item/ammo_casing/c45
matter = list(DEFAULT_WALL_MATERIAL = 1500)
caliber = ".45"
insert_sound = /decl/sound_category/polymer_slide_reload
insert_sound = /singleton/sound_category/polymer_slide_reload
max_ammo = 20
/obj/item/ammo_magazine/submachinemag/empty
@@ -279,7 +279,7 @@
ammo_type = /obj/item/ammo_casing/c45
matter = list(DEFAULT_WALL_MATERIAL = 3750)
caliber = ".45"
insert_sound = /decl/sound_category/polymer_slide_reload
insert_sound = /singleton/sound_category/polymer_slide_reload
max_ammo = 50
// End of SMGs and PDWs //
@@ -291,7 +291,7 @@
origin_tech = list(TECH_COMBAT = 2)
mag_type = MAGAZINE
caliber = "a556"
insert_sound = /decl/sound_category/rifle_slide_reload
insert_sound = /singleton/sound_category/rifle_slide_reload
matter = list(DEFAULT_WALL_MATERIAL = 1800)
ammo_type = /obj/item/ammo_casing/a556
max_ammo = 30
@@ -361,7 +361,7 @@
icon_state = "75"
mag_type = MAGAZINE
caliber = "75"
insert_sound = /decl/sound_category/rifle_slide_reload
insert_sound = /singleton/sound_category/rifle_slide_reload
ammo_type = /obj/item/ammo_casing/a75
multiple_sprites = 1
max_ammo = 4
@@ -388,7 +388,7 @@
origin_tech = list(TECH_COMBAT = 2)
mag_type = MAGAZINE
caliber = "a762"
insert_sound = /decl/sound_category/rifle_slide_reload
insert_sound = /singleton/sound_category/rifle_slide_reload
matter = list(DEFAULT_WALL_MATERIAL = 4500)
ammo_type = /obj/item/ammo_casing/a762
max_ammo = 50
@@ -402,7 +402,7 @@
icon_state = "c762"
mag_type = MAGAZINE
caliber = "a762"
insert_sound = /decl/sound_category/rifle_slide_reload
insert_sound = /singleton/sound_category/rifle_slide_reload
matter = list(DEFAULT_WALL_MATERIAL = 1800)
ammo_type = /obj/item/ammo_casing/a762
max_ammo = 20
@@ -450,7 +450,7 @@
icon_state = "flechette"
mag_type = MAGAZINE
caliber = "flechette"
insert_sound = /decl/sound_category/rifle_slide_reload
insert_sound = /singleton/sound_category/rifle_slide_reload
matter = list(DEFAULT_WALL_MATERIAL = 1200)
ammo_type = /obj/item/ammo_casing/flechette
max_ammo = 40
@@ -478,7 +478,7 @@
name = "magazine (slug)"
icon_state = "csmb"
caliber = "shotgun"
insert_sound = /decl/sound_category/rifle_slide_reload
insert_sound = /singleton/sound_category/rifle_slide_reload
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/shotgun
max_ammo = 8

8
code/modules/projectiles/ammunition/bullets.dm
View File

@@ -107,8 +107,8 @@
caliber = "shotgun"
projectile_type = /obj/item/projectile/bullet/shotgun
matter = list(DEFAULT_WALL_MATERIAL = 360)
reload_sound = /decl/sound_category/shotgun_reload
drop_sound = /decl/sound_category/casing_drop_sound_shotgun
reload_sound = /singleton/sound_category/shotgun_reload
drop_sound = /singleton/sound_category/casing_drop_sound_shotgun
/obj/item/ammo_casing/shotgun/used/Initialize()
. = ..()
@@ -358,7 +358,7 @@
slot_flags = null
max_stack = 1
reload_sound = 'sound/weapons/reloads/shotgun_pump.ogg'
drop_sound = /decl/sound_category/generic_drop_sound
drop_sound = /singleton/sound_category/generic_drop_sound
/obj/item/ammo_casing/cannon/explosive
name = "explosive cannonball"
@@ -379,7 +379,7 @@
slot_flags = null
desc = "A miniaturized version of a nuclear bomb."
projectile_type = /obj/item/projectile/bullet/nuke
drop_sound = /decl/sound_category/generic_drop_sound
drop_sound = /singleton/sound_category/generic_drop_sound
max_stack = 2
/obj/item/ammo_casing/musket