cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds Materials to Every Autolathe and Protolathe Item (except for ammo boxes, IK mags, and Dart Boxes) (#31445)

Browse Source 
* Holy fuck there's so much shit I'm not even done

* oh god there's so many

* it is done

* Update autolathe_designs.dm

* Update circuitboard.dm
This commit is contained in:
CRUNCH
2026-01-30 21:25:40 +00:00
committed by GitHub
parent 64d5fcb6ef
commit da1ebd039d
155 changed files with 640 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/ammo_casings.dm
+7 -2
View File
@@ -189,6 +189,7 @@
projectile_type = /obj/projectile/bullet/pellet
pellets = 6
variance = 25
materials = list(MAT_METAL = 4000)
/obj/item/ammo_casing/shotgun/rubbershot
name = "rubbershot shell"
@@ -197,14 +198,14 @@
projectile_type = /obj/projectile/bullet/pellet/rubber
pellets = 6
variance = 25
materials = list(MAT_METAL=4000)
materials = list(MAT_METAL = 4000)
/obj/item/ammo_casing/shotgun/beanbag
name = "beanbag slug"
desc = "A 12 gauge shell loaded with a beanbag slug for less-lethal takedowns."
icon_state = "beanbag"
projectile_type = /obj/projectile/bullet/weakbullet
materials = list(MAT_METAL=250)
materials = list(MAT_METAL = 250)
muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL
muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL
@@ -238,6 +239,7 @@
icon_state = "incendiary"
projectile_type = /obj/projectile/bullet/incendiary/shell
muzzle_flash_color = LIGHT_COLOR_FIRE
materials = list(MAT_METAL = 4000)
/obj/item/ammo_casing/shotgun/frag12
name = "\improper FRAG-12 slug"
@@ -272,6 +274,7 @@
muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL
muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL
muzzle_flash_color = LIGHT_COLOR_DARKRED
materials = list(MAT_METAL = 4000, MAT_GLASS = 4000)
/obj/item/ammo_casing/shotgun/lasershot
name = "lasershot"
@@ -289,6 +292,7 @@
desc = "An empty 12 gauge shell, ready to be loaded with all manner of projectiles."
icon_state = "techshell"
projectile_type = null
materials = list(MAT_METAL = 4000, MAT_GLASS = 200)
/obj/item/ammo_casing/shotgun/dart
name = "shotgun dart"
@@ -298,6 +302,7 @@
projectile_type = /obj/projectile/bullet/dart
muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL
muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL
materials = list(MAT_METAL = 4000)
/obj/item/ammo_casing/shotgun/dart/Initialize(mapload)
. = ..()
code/modules/projectiles/ammunition/magazines.dm
+2 -1
View File
@@ -271,6 +271,7 @@
multiload = 0
slow_loading = TRUE
w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL = 10000)
///A var to check if the mag is being loaded
var/being_loaded = FALSE
/// There are two reloading processes ongoing so cancel them
@@ -611,7 +612,7 @@
name = "DL-88 charge pack"
desc = "One-use charge pack for the DL-88 energy revolver."
icon_state = "handgun_ammo_battery"
materials = list(MAT_METAL = 20000)
materials = list(MAT_METAL = 20000, MAT_GLASS = 6000)
var/charge = 1000
// Overwrite description so shells aren't displayed
code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+2
View File
@@ -408,6 +408,7 @@
icon = 'icons/obj/objects.dmi'
icon_state = "modkit"
origin_tech = "programming=2;materials=2;magnets=4"
materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_GOLD = 1500, MAT_URANIUM = 1000)
require_module = TRUE
module_type = /obj/item/robot_module/miner
usesound = 'sound/items/screwdriver.ogg'
@@ -555,6 +556,7 @@
//AoE blasts
/obj/item/borg/upgrade/modkit/aoe
modifier = 0
materials = list(MAT_METAL = 8000, MAT_GLASS = 1500, MAT_SILVER = 2000, MAT_GOLD = 2000, MAT_DIAMOND = 2000)
var/turf_aoe = FALSE
var/stats_stolen = FALSE
code/modules/projectiles/guns/energy/special_eguns.dm
+5
View File
@@ -130,6 +130,7 @@
fire_sound = 'sound/effects/stealthoff.ogg'
ammo_type = list(/obj/item/ammo_casing/energy/flora/yield, /obj/item/ammo_casing/energy/flora/mut)
origin_tech = "materials=2;biotech=4"
materials = list(MAT_METAL = 2000, MAT_GLASS = 500)
modifystate = 1
ammo_x_offset = 1
selfcharge = TRUE
@@ -239,6 +240,7 @@
icon_state = "plasmacutter"
inhand_icon_state = "plasmacutter"
origin_tech = "combat=1;materials=3;magnets=2;plasmatech=3;engineering=1"
materials = list(MAT_METAL = 2000, MAT_GLASS = 500, MAT_PLASMA = 400)
needs_permit = FALSE
ammo_type = list(/obj/item/ammo_casing/energy/plasma)
fire_sound = 'sound/weapons/laser.ogg'
@@ -299,6 +301,7 @@
inhand_icon_state = "adv_plasmacutter"
modifystate = "adv_plasmacutter"
origin_tech = "combat=3;materials=4;magnets=3;plasmatech=4;engineering=2"
materials = list(MAT_METAL = 3000, MAT_GLASS = 1000, MAT_PLASMA = 2000, MAT_GOLD = 500)
ammo_type = list(/obj/item/ammo_casing/energy/plasma/adv)
force = 15
@@ -322,6 +325,7 @@
icon_state = "wormhole_projector1"
inhand_icon_state = null
origin_tech = "combat=4;bluespace=6;plasmatech=4;engineering=4"
materials = list(MAT_SILVER = 2000, MAT_METAL = 5000, MAT_DIAMOND = 2000, MAT_BLUESPACE = 3000)
charge_delay = 5
selfcharge = TRUE
ammo_type = list(/obj/item/ammo_casing/energy/wormhole, /obj/item/ammo_casing/energy/wormhole/orange)
@@ -621,6 +625,7 @@
worn_icon_state = "bsg"
inhand_icon_state = "bsg"
origin_tech = "combat=6;materials=6;powerstorage=6;bluespace=6;magnets=6" //cutting edge technology, be my guest if you want to deconstruct one instead of use it.
materials = list(MAT_METAL = 12000, MAT_GLASS = 2000, MAT_SILVER = 4000, MAT_PLASMA = 4000, MAT_TITANIUM = 4000, MAT_BLUESPACE = 6000)
ammo_type = list(/obj/item/ammo_casing/energy/bsg)
weapon_weight = WEAPON_HEAVY
w_class = WEIGHT_CLASS_BULKY