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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-06-19 21:55:06 -04:00
committed by GitHub
parent 42cdb33edb
commit c75144c9c2
1 changed files with 4 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,8 +235,7 @@
/obj/item/mecha_parts/mecha_equipment/proc/detach(atom/moveto=null) /obj/item/mecha_parts/mecha_equipment/proc/detach(atom/moveto=null)
moveto = moveto || get_turf(chassis) moveto = moveto || get_turf(chassis)
<<<<<<< HEAD forceMove(moveto)
if(src.Move(moveto))
chassis.equipment -= src chassis.equipment -= src
chassis.universal_equipment -= src chassis.universal_equipment -= src
if(equip_type) if(equip_type)
@@ -262,60 +261,7 @@
update_chassis_page() update_chassis_page()
chassis.log_message("[src] removed from equipment.") chassis.log_message("[src] removed from equipment.")
chassis = null chassis = null
set_ready_state(1)
||||||| parent of 65ba367501... Merge pull request #10686 from VOREStation/upstream-merge-8146
if(src.Move(moveto))
chassis.equipment -= src
chassis.universal_equipment -= src
if(equip_type)
switch(equip_type)
if(EQUIP_HULL)
chassis.hull_equipment -= src
if(EQUIP_WEAPON)
chassis.weapon_equipment -= src
if(EQUIP_UTILITY)
chassis.utility_equipment -= src
if(EQUIP_SPECIAL)
chassis.special_equipment -= src
//VOREStation Addition begin: MICROMECHS
if(EQUIP_MICRO_UTILITY)
chassis.micro_utility_equipment -= src
if(EQUIP_MICRO_WEAPON)
chassis.micro_weapon_equipment -= src
//VOREStation Addition end: MICROMECHS
if(chassis.selected == src)
chassis.selected = null
update_chassis_page()
chassis.log_message("[src] removed from equipment.")
chassis = null
set_ready_state(1)
=======
forceMove(moveto)
chassis.equipment -= src
chassis.universal_equipment -= src
if(equip_type)
switch(equip_type)
if(EQUIP_HULL)
chassis.hull_equipment -= src
if(EQUIP_WEAPON)
chassis.weapon_equipment -= src
if(EQUIP_UTILITY)
chassis.utility_equipment -= src
if(EQUIP_SPECIAL)
chassis.special_equipment -= src
//VOREStation Addition begin: MICROMECHS
if(EQUIP_MICRO_UTILITY)
chassis.micro_utility_equipment -= src
if(EQUIP_MICRO_WEAPON)
chassis.micro_weapon_equipment -= src
//VOREStation Addition end: MICROMECHS
if(chassis.selected == src)
chassis.selected = null
update_chassis_page()
chassis.log_message("[src] removed from equipment.")
chassis = null
set_ready_state(TRUE) set_ready_state(TRUE)
>>>>>>> 65ba367501... Merge pull request #10686 from VOREStation/upstream-merge-8146
enable_special = FALSE enable_special = FALSE
return return