cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5827 from Seris02/circuitboxfix

Browse Source 
fixes circuit bags
This commit is contained in:
Razgriz
2023-03-04 16:31:21 -07:00
committed by GitHub
parent 6cd076bbe7 d5b609d17c
commit 27f5f830e0
1 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
code/modules/integrated_electronics/core/tools.dm
View File

@@ -285,7 +285,7 @@
return //No
/obj/item/weapon/storage/bag/circuits/basic/Initialize()
. = ..()
//. = ..() CHOMPEdit
new /obj/item/weapon/storage/bag/circuits/mini/arithmetic(src)
new /obj/item/weapon/storage/bag/circuits/mini/trig(src)
new /obj/item/weapon/storage/bag/circuits/mini/input(src)
@@ -303,10 +303,14 @@
new /obj/item/device/multitool(src)
new /obj/item/weapon/tool/screwdriver(src)
new /obj/item/weapon/tool/crowbar(src)
new /obj/item/device/integrated_electronics/wirer(src) //CHOMPEdit
new /obj/item/device/integrated_electronics/debugger(src) //CHOMPEdit
new /obj/item/device/integrated_electronics/detailer(src) //CHOMPEdit
make_exact_fit()
. = ..() //CHOMPEdit
/obj/item/weapon/storage/bag/circuits/all/Initialize()
. = ..()
//. = ..() CHOMPEdit
new /obj/item/weapon/storage/bag/circuits/mini/arithmetic/all(src)
new /obj/item/weapon/storage/bag/circuits/mini/trig/all(src)
new /obj/item/weapon/storage/bag/circuits/mini/input/all(src)
@@ -327,8 +331,10 @@
new /obj/item/device/electronic_assembly/drone(src)
new /obj/item/device/integrated_electronics/wirer(src)
new /obj/item/device/integrated_electronics/debugger(src)
new /obj/item/device/integrated_electronics/detailer(src) //CHOMPEdit
new /obj/item/weapon/tool/crowbar(src)
make_exact_fit()
. = ..() //CHOMPEdit
/obj/item/weapon/storage/bag/circuits/mini
name = "circuit box"
@@ -346,13 +352,13 @@
/obj/item/weapon/storage/bag/circuits/mini/arithmetic/all // Don't believe this will ever be needed.
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/arithmetic/New()
..()
/obj/item/weapon/storage/bag/circuits/mini/arithmetic/Initialize()
for(var/obj/item/integrated_circuit/arithmetic/IC in all_integrated_circuits)
if(IC.spawn_flags & spawn_flags_to_use)
for(var/i = 1 to 4)
new IC.type(src)
make_exact_fit()
. = ..()
/obj/item/weapon/storage/bag/circuits/mini/trig
@@ -363,13 +369,13 @@
/obj/item/weapon/storage/bag/circuits/mini/trig/all // Ditto
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/trig/New()
..()
/obj/item/weapon/storage/bag/circuits/mini/trig/Initialize()
for(var/obj/item/integrated_circuit/trig/IC in all_integrated_circuits)
if(IC.spawn_flags & spawn_flags_to_use)
for(var/i = 1 to 4)
new IC.type(src)
make_exact_fit()
. = ..()
/obj/item/weapon/storage/bag/circuits/mini/input
@@ -380,13 +386,13 @@
/obj/item/weapon/storage/bag/circuits/mini/input/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/input/New()
..()
/obj/item/weapon/storage/bag/circuits/mini/input/Initialize()
for(var/obj/item/integrated_circuit/input/IC in all_integrated_circuits)
if(IC.spawn_flags & spawn_flags_to_use)
for(var/i = 1 to 4)
new IC.type(src)
make_exact_fit()
. = ..()
/obj/item/weapon/storage/bag/circuits/mini/output
@@ -397,13 +403,13 @@
/obj/item/weapon/storage/bag/circuits/mini/output/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/output/New()
..()
/obj/item/weapon/storage/bag/circuits/mini/output/Initialize()
for(var/obj/item/integrated_circuit/output/IC in all_integrated_circuits)
if(IC.spawn_flags & spawn_flags_to_use)
for(var/i = 1 to 4)
new IC.type(src)
make_exact_fit()
. = ..()
/obj/item/weapon/storage/bag/circuits/mini/memory
@@ -414,13 +420,13 @@
/obj/item/weapon/storage/bag/circuits/mini/memory/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/memory/New()
..()
/obj/item/weapon/storage/bag/circuits/mini/memory/Initialize()
for(var/obj/item/integrated_circuit/memory/IC in all_integrated_circuits)
if(IC.spawn_flags & spawn_flags_to_use)
for(var/i = 1 to 4)
new IC.type(src)
make_exact_fit()
. = ..()
/obj/item/weapon/storage/bag/circuits/mini/logic
@@ -431,13 +437,13 @@
/obj/item/weapon/storage/bag/circuits/mini/logic/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/logic/New()
..()
/obj/item/weapon/storage/bag/circuits/mini/logic/Initialize()
for(var/obj/item/integrated_circuit/logic/IC in all_integrated_circuits)
if(IC.spawn_flags & spawn_flags_to_use)
for(var/i = 1 to 4)
new IC.type(src)
make_exact_fit()
. = ..()
/obj/item/weapon/storage/bag/circuits/mini/time
@@ -448,13 +454,13 @@
/obj/item/weapon/storage/bag/circuits/mini/time/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/time/New()
..()
/obj/item/weapon/storage/bag/circuits/mini/time/Initialize()
for(var/obj/item/integrated_circuit/time/IC in all_integrated_circuits)
if(IC.spawn_flags & spawn_flags_to_use)
for(var/i = 1 to 4)
new IC.type(src)
make_exact_fit()
. = ..()
/obj/item/weapon/storage/bag/circuits/mini/reagents
@@ -465,13 +471,13 @@
/obj/item/weapon/storage/bag/circuits/mini/reagents/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/reagents/New()
..()
/obj/item/weapon/storage/bag/circuits/mini/reagents/Initialize()
for(var/obj/item/integrated_circuit/reagent/IC in all_integrated_circuits)
if(IC.spawn_flags & spawn_flags_to_use)
for(var/i = 1 to 4)
new IC.type(src)
make_exact_fit()
. = ..()
/obj/item/weapon/storage/bag/circuits/mini/transfer
@@ -482,13 +488,13 @@
/obj/item/weapon/storage/bag/circuits/mini/transfer/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/transfer/New()
..()
/obj/item/weapon/storage/bag/circuits/mini/transfer/Initialize()
for(var/obj/item/integrated_circuit/transfer/IC in all_integrated_circuits)
if(IC.spawn_flags & spawn_flags_to_use)
for(var/i = 1 to 4)
new IC.type(src)
make_exact_fit()
. = ..()
/obj/item/weapon/storage/bag/circuits/mini/converter
@@ -499,13 +505,13 @@
/obj/item/weapon/storage/bag/circuits/mini/converter/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/converter/New()
..()
/obj/item/weapon/storage/bag/circuits/mini/converter/Initialize()
for(var/obj/item/integrated_circuit/converter/IC in all_integrated_circuits)
if(IC.spawn_flags & spawn_flags_to_use)
for(var/i = 1 to 4)
new IC.type(src)
make_exact_fit()
. = ..()
/obj/item/weapon/storage/bag/circuits/mini/smart
name = "smart box"
@@ -515,13 +521,13 @@
/obj/item/weapon/storage/bag/circuits/mini/smart/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/smart/New()
..()
/obj/item/weapon/storage/bag/circuits/mini/smart/Initialize()
for(var/obj/item/integrated_circuit/smart/IC in all_integrated_circuits)
if(IC.spawn_flags & spawn_flags_to_use)
for(var/i = 1 to 4)
new IC.type(src)
make_exact_fit()
. = ..()
/obj/item/weapon/storage/bag/circuits/mini/manipulation
name = "manipulation box"
@@ -531,13 +537,13 @@
/obj/item/weapon/storage/bag/circuits/mini/manipulation/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/manipulation/New()
..()
/obj/item/weapon/storage/bag/circuits/mini/manipulation/Initialize()
for(var/obj/item/integrated_circuit/manipulation/IC in all_integrated_circuits)
if(IC.spawn_flags & spawn_flags_to_use)
for(var/i = 1 to 4)
new IC.type(src)
make_exact_fit()
. = ..()
/obj/item/weapon/storage/bag/circuits/mini/power
@@ -548,8 +554,7 @@
/obj/item/weapon/storage/bag/circuits/mini/power/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/power/New()
..()
/obj/item/weapon/storage/bag/circuits/mini/power/Initialize()
for(var/obj/item/integrated_circuit/passive/power/IC in all_integrated_circuits)
if(IC.spawn_flags & spawn_flags_to_use)
for(var/i = 1 to 4)
@@ -559,3 +564,4 @@
for(var/i = 1 to 4)
new IC.type(src)
make_exact_fit()
. = ..()