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

Update component.dm

Browse Source
This commit is contained in:
Nadyr
2021-03-21 05:03:29 -04:00
committed by GitHub
parent 2915e36ee8
commit 84be4c5e38
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/component.dm
+1 -9
View File
@@ -77,18 +77,10 @@
external_type = /obj/item/robot_parts/robot_component/armour
max_damage = 90
<<<<<<< HEAD
||||||| parent of b3f3ea7c9d... Merge pull request #9974 from VOREStation/upstream-merge-7988
/datum/robot_component/armour/platform
name = "platform armour plating"
external_type = /obj/item/robot_parts/robot_component/armour_platform
max_damage = 180
=======
/datum/robot_component/armour/platform
name = "platform armour plating"
external_type = /obj/item/robot_parts/robot_component/armour_platform
max_damage = 140
>>>>>>> b3f3ea7c9d... Merge pull request #9974 from VOREStation/upstream-merge-7988
// ACTUATOR
// Enables movement.
@@ -268,4 +260,4 @@
/obj/item/robot_parts/robot_component/radio
name = "radio"
icon_state = "radio"
icon_state_broken = "radio_broken"
icon_state_broken = "radio_broken"