diff --git a/code/datums/supplypacks/robotics_vr.dm b/code/datums/supplypacks/robotics_vr.dm index 5e06210079..460831fbac 100644 --- a/code/datums/supplypacks/robotics_vr.dm +++ b/code/datums/supplypacks/robotics_vr.dm @@ -1,3 +1,4 @@ +/* //CHOMPedit commented micromech stuff, because fuck this trash /datum/supply_pack/robotics/mecha_gopher name = "Circuit Crate (\"Gopher\" APLU)" contains = list( @@ -31,7 +32,7 @@ cost = 25 containertype = /obj/structure/closet/crate/secure/science containername = "APLU \"Weasel\" Circuit Crate" - access = access_robotics + access = access_robotics */ /datum/supply_pack/robotics/some_robolimbs name = "Basic Robolimb Blueprints" diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index 412437b3aa..2accaee5ed 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -78,12 +78,14 @@ chassis.special_equipment -= src listclearnulls(chassis.special_equipment) //VOREStation Addition begin: MICROMECHS + //CHOMPedit commented micromech stuff, because fuck this trash + /* if(equip_type == EQUIP_MICRO_UTILITY) chassis.micro_utility_equipment -= src listclearnulls(chassis.micro_utility_equipment) if(equip_type == EQUIP_MICRO_WEAPON) chassis.micro_weapon_equipment -= src - listclearnulls(chassis.micro_weapon_equipment) + listclearnulls(chassis.micro_weapon_equipment) */ //VOREStation Addition end: MICROMECHS chassis.universal_equipment -= src chassis.equipment -= src @@ -168,10 +170,12 @@ if(equip_type == EQUIP_SPECIAL && M.special_equipment.len < M.max_special_equip) return 1 //VOREStation Addition begin: MICROMECHS + //CHOMPedit commented micromech stuff, because fuck this trash + /* if(equip_type == EQUIP_MICRO_UTILITY && M.micro_utility_equipment.len < M.max_micro_utility_equip) return 1 if(equip_type == EQUIP_MICRO_WEAPON && M.micro_weapon_equipment.len < M.max_micro_weapon_equip) - return 1 + return 1 */ //VOREStation Addition end: MICROMECHS if(equip_type != EQUIP_SPECIAL && M.universal_equipment.len < M.max_universal_equip) //The exosuit needs to be military grade to actually have a universal slot capable of accepting a true weapon. if(equip_type == EQUIP_WEAPON && !istype(M, /obj/mecha/combat)) @@ -202,12 +206,14 @@ M.special_equipment += src has_equipped = 1 //VOREStation Addition begin: MICROMECHS + //CHOMPedit commented micromech stuff, because fuck this trash + /* if(equip_type == EQUIP_MICRO_UTILITY && M.micro_utility_equipment.len < M.max_micro_utility_equip && !has_equipped) M.micro_utility_equipment += src has_equipped = 1 if(equip_type == EQUIP_MICRO_WEAPON && M.micro_weapon_equipment.len < M.max_micro_weapon_equip && !has_equipped) M.micro_weapon_equipment += src - has_equipped = 1 + has_equipped = 1 */ //VOREStation Addition end: MICROMECHS if(equip_type != EQUIP_SPECIAL && M.universal_equipment.len < M.max_universal_equip && !has_equipped) M.universal_equipment += src @@ -240,10 +246,12 @@ if(EQUIP_SPECIAL) chassis.special_equipment -= src //VOREStation Addition begin: MICROMECHS + //CHOMPedit commented micromech stuff, because fuck this trash + /* if(EQUIP_MICRO_UTILITY)//CHOMPstation edit - This was improperly named bugging detaching on my equipment fix. chassis.micro_utility_equipment -= src if(EQUIP_MICRO_WEAPON) - chassis.micro_weapon_equipment -= src + chassis.micro_weapon_equipment -= src */ //VOREStation Addition end: MICROMECHS if(chassis.selected == src) chassis.selected = null diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index fe8ec5876d..492837fbeb 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -67,9 +67,9 @@ "Vehicle", "Rigsuit", "Phazon", - "Gopher", // VOREStation Add - "Polecat", // VOREStation Add - "Weasel", // VOREStation Add + //"Gopher", // VOREStation Add //CHOMPedit commented micromech stuff, because fuck this trash + //"Polecat", // VOREStation Add //CHOMPedit commented micromech stuff, because fuck this trash + //"Weasel", // VOREStation Add //CHOMPedit commented micromech stuff, because fuck this trash "Exosuit Equipment", "Exosuit Internals", "Exosuit Ammunition", diff --git a/code/game/mecha/mech_prosthetics.dm b/code/game/mecha/mech_prosthetics.dm index 72e51262e7..640a57140f 100644 --- a/code/game/mecha/mech_prosthetics.dm +++ b/code/game/mecha/mech_prosthetics.dm @@ -48,9 +48,9 @@ "Vehicle", "Rigsuit", "Phazon", - "Gopher", // VOREStation Add - "Polecat", // VOREStation Add - "Weasel", // VOREStation Add + //"Gopher", // VOREStation Add //CHOMPedit commented micromech stuff, because fuck this trash + //"Polecat", // VOREStation Add //CHOMPedit commented micromech stuff, because fuck this trash + //"Weasel", // VOREStation Add //CHOMPedit commented micromech stuff, because fuck this trash "Exosuit Equipment", "Exosuit Internals", "Exosuit Ammunition", diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 8e7480c6a2..7684b88e56 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -2232,7 +2232,7 @@ output += "Universal Module: [W.name] Detach
" for(var/obj/item/mecha_parts/mecha_equipment/W in special_equipment) output += "Special Module: [W.name] Detach
" - for(var/obj/item/mecha_parts/mecha_equipment/W in micro_utility_equipment)//CHOMPstation Edit - Adds micro equipent to the menu + /*for(var/obj/item/mecha_parts/mecha_equipment/W in micro_utility_equipment)//CHOMPstation Edit - Adds micro equipent to the menu output += "Micro Utility Module: [W.name] Detach
" for(var/obj/item/mecha_parts/mecha_equipment/W in micro_weapon_equipment) output += "Micro Weapon Module: [W.name] Detach
" @@ -2244,7 +2244,7 @@ Available universal slots: [max_universal_equip-universal_equipment.len]
Available special slots: [max_special_equip-special_equipment.len]
- "} + "} */ //CHOMPedit commented micromech stuff, because fuck this trash return output /obj/mecha/proc/get_equipment_list() //outputs mecha equipment list in html diff --git a/code/game/mecha/micro/mecha_construction_paths_vr.dm b/code/game/mecha/micro/mecha_construction_paths_vr.dm index a63322b5a3..41a4d43686 100644 --- a/code/game/mecha/micro/mecha_construction_paths_vr.dm +++ b/code/game/mecha/micro/mecha_construction_paths_vr.dm @@ -1,4 +1,4 @@ - +/* //CHOMPedit commented micromech stuff, because fuck this trash /datum/construction/mecha/polecat_chassis steps = list(list("key"=/obj/item/mecha_parts/micro/part/polecat_torso),//1 list("key"=/obj/item/mecha_parts/micro/part/polecat_left_arm),//2 @@ -766,3 +766,4 @@ ..() feedback_inc("mecha_weasel_created",1) return +*/ \ No newline at end of file diff --git a/code/game/mecha/micro/mecha_parts_vr.dm b/code/game/mecha/micro/mecha_parts_vr.dm index 59f6714351..d0c45ccb38 100644 --- a/code/game/mecha/micro/mecha_parts_vr.dm +++ b/code/game/mecha/micro/mecha_parts_vr.dm @@ -1,5 +1,5 @@ //new micro parts define - +/* //CHOMPedit commented micromech stuff, because fuck this trash /obj/item/mecha_parts/micro name = "mecha part" icon = 'icons/mecha/mech_construct_vr.dmi' @@ -124,7 +124,7 @@ icon_state = "weasel-arm-right" origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) -/*/obj/item/mecha_parts/micro/part/weasel_left_leg +/obj/item/mecha_parts/micro/part/weasel_left_leg name="Weasel Left Leg" icon_state = "weasel-leg-left" origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) @@ -132,9 +132,9 @@ /obj/item/mecha_parts/micro/part/weasel_right_leg name="Weasel Right Leg" icon_state = "weasel-leg-right" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3)*/ + origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/micro/part/weasel_tri_leg name="Weasel Legs" icon_state = "weasel-leg-all" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) \ No newline at end of file + origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) */ \ No newline at end of file diff --git a/code/game/mecha/micro/mecha_vr.dm b/code/game/mecha/micro/mecha_vr.dm index a0dd1b43e9..237b64f30f 100644 --- a/code/game/mecha/micro/mecha_vr.dm +++ b/code/game/mecha/micro/mecha_vr.dm @@ -1,4 +1,4 @@ -#ifdef T_BOARD_MICRO_MECHA +/*#ifdef T_BOARD_MICRO_MECHA ////CHOMPedit commented micromech stuff, because fuck this trash #error T_BOARD_MICRO_MECHA already defined elsewhere, we can't use it. #endif #define T_BOARD_MICRO_MECHA(name) "exosuit module circuit board (" + (name) + ")" @@ -44,4 +44,4 @@ /obj/item/weapon/circuitboard/mecha/weasel/main name = T_BOARD_MICRO_MECHA("Weasel central control") - icon_state = "mainboard" + icon_state = "mainboard" */ diff --git a/code/game/mecha/micro/mechfab_designs_vr.dm b/code/game/mecha/micro/mechfab_designs_vr.dm index c48c10184a..4ef7fa76e3 100644 --- a/code/game/mecha/micro/mechfab_designs_vr.dm +++ b/code/game/mecha/micro/mechfab_designs_vr.dm @@ -1,3 +1,4 @@ +/* //CHOMPedit commented micromech stuff, because fuck this trash /datum/design/item/mechfab/gopher category = list("Gopher") time = 5 @@ -162,7 +163,7 @@ build_path = /obj/item/mecha_parts/micro/part/weasel_right_arm materials = list(DEFAULT_WALL_MATERIAL = 8750) -/*/datum/design/item/mechfab/weasel/left_leg +/datum/design/item/mechfab/weasel/left_leg name = "Weasel Left Leg" id = "weasel_left_leg" build_path = /obj/item/mecha_parts/micro/part/weasel_left_leg @@ -172,7 +173,7 @@ name = "Weasel Right Leg" id = "weasel_right_leg" build_path = /obj/item/mecha_parts/micro/part/weasel_right_leg - materials = list(DEFAULT_WALL_MATERIAL = 12500)*/ + materials = list(DEFAULT_WALL_MATERIAL = 12500) /datum/design/item/mechfab/weasel/tri_leg name = "Weasel Tri Leg" @@ -184,9 +185,9 @@ name = "Weasel Head" id = "weasel_head" build_path = /obj/item/mecha_parts/micro/part/weasel_head - materials = list(DEFAULT_WALL_MATERIAL = 7000, "glass" = 2500) + materials = list(DEFAULT_WALL_MATERIAL = 7000, "glass" = 2500) */ -/datum/design/item/mecha/medigun +/datum/design/item/mecha/medigun //Who the fuck thought it was a good idea to put this here? name = "BL-3/P directed restoration system" desc = "A portable medical system used to treat external injuries from afar." id = "mech_medigun" diff --git a/code/game/mecha/micro/micro.dm b/code/game/mecha/micro/micro.dm index 97f86f7472..5c2c2ed6ff 100644 --- a/code/game/mecha/micro/micro.dm +++ b/code/game/mecha/micro/micro.dm @@ -1,3 +1,4 @@ +/* //CHOMPedit commented micromech stuff, because fuck this trash /obj/mecha var/max_micro_utility_equip = 0 var/max_micro_weapon_equip = 0 @@ -155,5 +156,5 @@ return result /obj/effect/decal/mecha_wreckage/micro - icon = 'icons/mecha/micro.dmi' + icon = 'icons/mecha/micro.dmi' */ diff --git a/code/game/mecha/micro/micro_equipment.dm b/code/game/mecha/micro/micro_equipment.dm index 2ea7e44763..8426766449 100644 --- a/code/game/mecha/micro/micro_equipment.dm +++ b/code/game/mecha/micro/micro_equipment.dm @@ -3,7 +3,7 @@ ///////////////////////////// //// WEAPONS BELOW //// ///////////////////////////// - +/* //CHOMPedit commented micromech stuff, because fuck this trash /obj/item/mecha_parts/mecha_equipment/weapon/energy/microlaser w_class = ITEMSIZE_LARGE desc = "A mounted micro laser-carbine for micro mechs." //CHOMPedit @@ -225,4 +225,4 @@ O.loc = src.loc to_chat(usr, "You empty the ore box") - return + return */ diff --git a/code/game/mecha/micro/security.dm b/code/game/mecha/micro/security.dm index d6d054a4f5..d634694510 100644 --- a/code/game/mecha/micro/security.dm +++ b/code/game/mecha/micro/security.dm @@ -1,3 +1,4 @@ +/* //CHOMPedit commented micromech stuff, because fuck this trash /obj/mecha/micro/sec/moved_inside(var/mob/living/carbon/human/H as mob) if(..()) if(H.client) @@ -55,4 +56,4 @@ /obj/effect/decal/mecha_wreckage/micro/sec/weasel name = "Weasel wreckage" - icon_state = "weasel-broken" + icon_state = "weasel-broken" */ diff --git a/code/game/mecha/micro/utility.dm b/code/game/mecha/micro/utility.dm index 9ceaa2bae9..4bc1e89321 100644 --- a/code/game/mecha/micro/utility.dm +++ b/code/game/mecha/micro/utility.dm @@ -1,4 +1,4 @@ - +/* //CHOMPedit commented micromech stuff, because fuck this trash /obj/mecha/micro/utility/gopher //small digging creature, to keep the theme desc = "A tough little utility mech for micro crewmembers, based on a miner borg chassis." @@ -21,4 +21,4 @@ /obj/effect/decal/mecha_wreckage/micro/utility/gopher name = "Gopher wreckage" icon_state = "gopher-broken" - +*/ diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index bd608ca006..05492c798a 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -217,7 +217,7 @@ can_hold = list( /obj/item/mecha_parts/part, - /obj/item/mecha_parts/micro/part, //VOREStation Edit: Allow construction of micromechs, + //obj/item/mecha_parts/micro/part, //VOREStation Edit: Allow construction of micromechs //CHOMPedit commented micromech stuff, because fuck this trash /obj/item/mecha_parts/mecha_equipment, /obj/item/mecha_parts/mecha_tracking, /obj/item/mecha_parts/component diff --git a/code/modules/research/designs/circuits/circuits_vr.dm b/code/modules/research/designs/circuits/circuits_vr.dm index 98d9c860bd..13af5f3117 100644 --- a/code/modules/research/designs/circuits/circuits_vr.dm +++ b/code/modules/research/designs/circuits/circuits_vr.dm @@ -27,6 +27,7 @@ sort_string = "HABAH" //////Micro mech stuff +/* //CHOMPedit commented micromech stuff, because fuck this trash /datum/design/circuit/mecha/gopher_main name = "'Gopher' central control" id = "gopher_main" @@ -79,7 +80,7 @@ id = "weasel_targ" req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2) build_path = /obj/item/weapon/circuitboard/mecha/weasel/targeting - sort_string = "NAAGC" + sort_string = "NAAGC" */ /datum/design/circuit/transhuman_clonepod name = "grower pod"