cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 14:47:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few chomp-specific typepaths and a marge conflict

Browse Source
This commit is contained in:
Raeschen
2023-06-21 08:26:10 +02:00
parent ed323a6950
commit ef98e7f4ea
3 changed files with 2 additions and 1035 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/circuitboards/frame.dm
+1 -1
View File
@@ -183,7 +183,7 @@
// origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 4)
//CHOMPedit Balance
req_components = list(
/obj/item/weapon/ore/bluespace_crystal = 2,
/obj/item/weapon/bluespace_crystal = 2,
/obj/item/weapon/stock_parts/capacitor = 2,
/obj/item/weapon/stock_parts/scanning_module = 2,
/obj/item/weapon/stock_parts/micro_laser =2,
maps/submaps/surface_submaps/wilderness/leopardmanderden.dmm
-1033
View File
File diff suppressed because it is too large Load Diff
modular_chomp/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+1 -1
View File
@@ -23,7 +23,7 @@
/obj/item/weapon/circuitboard,
/obj/item/weapon/smes_coil,
/obj/item/weapon/fuel_assembly,
/obj/item/weapon/ore/bluespace_crystal
/obj/item/weapon/bluespace_crystal
) // CHOMPEdit - Buffing the gripper to allow bluespace crystal use for telesci building.
var/obj/item/wrapped = null // Item currently being held.