Update radio.dm

2018-05-06 03:10:20 -04:00
parent 725634c9ea
commit d4d052bae2
1 changed files with 0 additions and 6 deletions
@@ -6,14 +6,8 @@
 	desc = "A basic handheld radio that communicates with local telecommunication networks."
 	dog_fashion = /datum/dog_fashion/back

-<<<<<<< HEAD
-	flags_1 = CONDUCT_1 | HEAR_1
-	flags_2 = NO_EMP_WIRES_2
-	slot_flags = SLOT_BELT
-=======
 	flags_1 = CONDUCT_1 | HEAR_1 | NO_EMP_WIRES_1
 	slot_flags = ITEM_SLOT_BELT
->>>>>>> fd4c753... replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2  (#37597)
 	throw_speed = 3
 	throw_range = 7
 	w_class = WEIGHT_CLASS_SMALL