cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

More conflicts yay

Browse Source
This commit is contained in:
cadyn
2020-11-21 18:51:16 -08:00
committed by GitHub
parent 03ccdbcba9
commit c23558a35d
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/clothing/glasses/glasses.dm
View File

@@ -544,11 +544,6 @@ BLIND // can't see anything
name = "optical thermal implants" name = "optical thermal implants"
desc = "A set of implantable lenses designed to augment your vision" desc = "A set of implantable lenses designed to augment your vision"
icon_state = "thermalimplants" icon_state = "thermalimplants"
<<<<<<< HEAD
item_state_slots = list(slot_r_hand_str = "sunglasses", slot_l_hand_str = "sunglasses")
||||||| parent of 7f84a6ce06... Merge pull request #9312 from KasparoVy/bird-is-the-word
item_state_slots = list(slot_r_hand_str = "sunglasses", slot_l_hand_str = "sunglasses")
=======
item_state_slots = list(slot_r_hand_str = "sunglasses", slot_l_hand_str = "sunglasses") item_state_slots = list(slot_r_hand_str = "sunglasses", slot_l_hand_str = "sunglasses")
/obj/item/clothing/glasses/aerogelgoggles /obj/item/clothing/glasses/aerogelgoggles
@@ -585,4 +580,3 @@ BLIND // can't see anything
to_chat(usr, "You push \the [src] up from in front of your eyes.") to_chat(usr, "You push \the [src] up from in front of your eyes.")
update_clothing_icon() update_clothing_icon()
usr.update_action_buttons() usr.update_action_buttons()
>>>>>>> 7f84a6ce06... Merge pull request #9312 from KasparoVy/bird-is-the-word