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

Remove micro mech stuff

Browse Source 
Time to take out the trash.
This commit is contained in:
Sym
2020-10-23 20:17:07 -04:00
parent 116eec49a1
commit 1173ddf675
15 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/datums/supplypacks/robotics_vr.dm
View File

@@ -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"

16
code/game/mecha/equipment/mecha_equipment.dm
View File

@@ -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

6
code/game/mecha/mech_fabricator.dm
View File

@@ -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",

6
code/game/mecha/mech_prosthetics.dm
View File

@@ -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",

4
code/game/mecha/mecha.dm
View File

@@ -2220,7 +2220,7 @@
output += "Universal Module: [W.name] <a href='?src=\ref[W];detach=1'>Detach</a><br>"
for(var/obj/item/mecha_parts/mecha_equipment/W in special_equipment)
output += "Special Module: [W.name] <a href='?src=\ref[W];detach=1'>Detach</a><br>"
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] <a href='?src=\ref[W];detach=1'>Detach</a><br>"
for(var/obj/item/mecha_parts/mecha_equipment/W in micro_weapon_equipment)
output += "Micro Weapon Module: [W.name] <a href='?src=\ref[W];detach=1'>Detach</a><br>"
@@ -2232,7 +2232,7 @@
<b>Available universal slots:</b> [max_universal_equip-universal_equipment.len]<br>
<b>Available special slots:</b> [max_special_equip-special_equipment.len]<br>
</div></div>
"}
"} */ //CHOMPedit commented micromech stuff, because fuck this trash
return output
/obj/mecha/proc/get_equipment_list() //outputs mecha equipment list in html

3
code/game/mecha/micro/mecha_construction_paths_vr.dm
View File

@@ -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
*/

8
code/game/mecha/micro/mecha_parts_vr.dm
View File

@@ -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)
origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) */

4
code/game/mecha/micro/mecha_vr.dm
View File

@@ -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" */

9
code/game/mecha/micro/mechfab_designs_vr.dm
View File

@@ -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"

3
code/game/mecha/micro/micro.dm
View File

@@ -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' */

4
code/game/mecha/micro/micro_equipment.dm
View File

@@ -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 laser-carbine for light exosuits."
@@ -225,4 +225,4 @@
O.loc = src.loc
to_chat(usr, "<span class='info'>You empty the ore box</span>")
return
return */

3
code/game/mecha/micro/security.dm
View File

@@ -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" */

4
code/game/mecha/micro/utility.dm
View File

@@ -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"
*/

2
code/modules/mob/living/silicon/robot/drone/drone_items.dm
View File

@@ -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

3
code/modules/research/designs/circuits/circuits_vr.dm
View File

@@ -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"