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

Materials subsystem, material defines instead of strings, structure materials. (#8447)

Browse Source 
The shitcode crusade begins.
This commit is contained in:
Matt Atlas
2020-03-18 20:19:11 +01:00
committed by GitHub
parent d952493ca0
commit 82437acd43
127 changed files with 687 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/boxes.dm
+3 -3
View File
@@ -32,7 +32,7 @@
/obj/item/ammo_magazine/c38/emp
name = "speed loader (.38 haywire)"
ammo_type = /obj/item/ammo_casing/c38/emp
matter = list(DEFAULT_WALL_MATERIAL = 360, "uranium" = 600)
matter = list(DEFAULT_WALL_MATERIAL = 360, MATERIAL_URANIUM = 600)
/obj/item/ammo_magazine/c45
name = "ammunition Box (.45)"
@@ -381,7 +381,7 @@
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/shotgun
max_ammo = 8
matter = list("metal" = 2880)
matter = list(MATERIAL_STEEL = 2880)
multiple_sprites = 1
/obj/item/ammo_magazine/assault_shotgun/shells
@@ -399,7 +399,7 @@
name = "magazine (stun shells)"
icon_state = "csms"
ammo_type = /obj/item/ammo_casing/shotgun/stunshell
matter = list(DEFAULT_WALL_MATERIAL = 2880, "glass" = 5760)
matter = list(DEFAULT_WALL_MATERIAL = 2880, MATERIAL_GLASS = 5760)
/obj/item/ammo_magazine/minigun
name = "minigun magazine box (7.62mm)"
code/modules/projectiles/ammunition/bullets.dm
+5 -5
View File
@@ -34,7 +34,7 @@
desc = "A .38 bullet casing fitted with a single-use ion pulse generator."
projectile_type = /obj/item/projectile/ion/small
icon_state = "empcasing"
matter = list(DEFAULT_WALL_MATERIAL = 130, "uranium" = 100)
matter = list(DEFAULT_WALL_MATERIAL = 130, MATERIAL_URANIUM = 100)
/obj/item/ammo_casing/trod
desc = "hyperdense tungsten rod residue."
@@ -125,7 +125,7 @@
icon_state = "pshell"
spent_icon = "pshell-spent"
projectile_type = /obj/item/projectile/bullet/shotgun/practice
matter = list("metal" = 90)
matter = list(MATERIAL_STEEL = 90)
/obj/item/ammo_casing/shotgun/beanbag
name = "beanbag shell"
@@ -143,7 +143,7 @@
icon_state = "stunshell"
spent_icon = "stunshell-spent"
projectile_type = /obj/item/projectile/energy/electrode/stunshot
matter = list(DEFAULT_WALL_MATERIAL = 360, "glass" = 720)
matter = list(DEFAULT_WALL_MATERIAL = 360, MATERIAL_GLASS = 720)
/obj/item/ammo_casing/shotgun/stunshell/emp_act(severity)
if(prob(100/severity)) BB = null
@@ -156,7 +156,7 @@
icon_state = "fshell"
spent_icon = "fshell-spent"
projectile_type = /obj/item/projectile/energy/flash/flare
matter = list(DEFAULT_WALL_MATERIAL = 90, "glass" = 90)
matter = list(DEFAULT_WALL_MATERIAL = 90, MATERIAL_GLASS = 90)
/obj/item/ammo_casing/shotgun/incendiary
name = "incendiary shell"
@@ -172,7 +172,7 @@
icon_state = "empshell"
spent_icon = "empshell-spent"
projectile_type = /obj/item/projectile/ion
matter = list(DEFAULT_WALL_MATERIAL = 260, "uranium" = 200)
matter = list(DEFAULT_WALL_MATERIAL = 260, MATERIAL_URANIUM = 200)
/obj/item/ammo_casing/tranq
name = "PPS shell"
code/modules/projectiles/guns/launcher/crossbow.dm
+1 -1
View File
@@ -265,7 +265,7 @@
else
to_chat(user, "<span class='notice'>You need at least five segments of cable coil to complete this task.</span>")
return
else if(istype(W,/obj/item/stack/material) && W.get_material_name() == "plastic")
else if(istype(W,/obj/item/stack/material) && W.get_material_name() == MATERIAL_PLASTIC)
if(buildstate == 3)
var/obj/item/stack/material/P = W
if(P.use(3))
code/modules/projectiles/guns/launcher/syringe_gun.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/ammo.dmi'
icon_state = "syringe-cartridge"
var/icon_flight = "syringe-cartridge-flight" //so it doesn't look so weird when shot
matter = list(DEFAULT_WALL_MATERIAL = 125, "glass" = 375)
matter = list(DEFAULT_WALL_MATERIAL = 125, MATERIAL_GLASS = 375)
flags = CONDUCT
slot_flags = SLOT_BELT | SLOT_EARS
throwforce = 3