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

Fixing conflicts

Browse Source
This commit is contained in:
Cadyn
2020-10-05 18:10:53 -07:00
parent 7b44df4701 2a79ecfdad
commit 07775449d7
2080 changed files with 1768339 additions and 30848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/integrated_electronics/core/assemblies/generic.dm
View File

@@ -154,8 +154,8 @@
icon_state = "setup_drone"
desc = "It's a case, for building mobile electronics with."
w_class = ITEMSIZE_NORMAL
max_components = IC_COMPONENTS_BASE * 1.5
max_complexity = IC_COMPLEXITY_BASE * 1.5
max_components = IC_COMPONENTS_BASE * 3 //CHOMP Edit ;Changing this to be 3 instead because as it stands its worthless
max_complexity = IC_COMPLEXITY_BASE * 3 //CHOMP Edit ;Changing this to be 3 instead because as it stands its worthless
can_anchor = FALSE
/obj/item/device/electronic_assembly/drone/can_move()
@@ -260,4 +260,4 @@
to allow it to stick to walls."
w_class = ITEMSIZE_TINY
max_components = IC_COMPONENTS_BASE / 2
max_complexity = IC_COMPLEXITY_BASE / 2
max_complexity = IC_COMPLEXITY_BASE / 2

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

@@ -272,7 +272,10 @@
/obj/item/device/integrated_electronics,
/obj/item/weapon/tool/crowbar,
/obj/item/weapon/tool/screwdriver,
/obj/item/device/multitool
/obj/item/device/multitool,
/obj/item/device/integrated_electronics/wirer, //CHOMP Edit,
/obj/item/device/integrated_electronics/debugger, //CHOMP Edit,
/obj/item/device/integrated_electronics/detailer, //CHOMP Edit,
)
cant_hold = list(/obj/item/weapon/tool/screwdriver/power)
@@ -551,4 +554,4 @@
if(IC.spawn_flags & spawn_flags_to_use)
for(var/i = 1 to 4)
new IC.type(src)
make_exact_fit()
make_exact_fit()