cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes the Modern Glasses breakable (#25431)

Browse Source 
* Makes the Modern Glasses breakable

* Apply suggestions from code review

* Apply suggestions from code review

---------

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
This commit is contained in:
Cursor
2023-12-05 02:37:00 +00:00
committed by GitHub
co-authored by Bloop
parent d19dbc94eb
commit e652235f18
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_globalvars/lists/quirks.dm
+1 -1
View File
@@ -8,7 +8,7 @@ GLOBAL_LIST_INIT(nearsighted_glasses, list(
"Thin" = /obj/item/clothing/glasses/regular/thin,
"Jamjar" = /obj/item/clothing/glasses/regular/jamjar,
"Binoclard" = /obj/item/clothing/glasses/regular/kim,
"Modern" = /obj/item/clothing/glasses/betterunshit, // SKYRAT ADD
"Modern" = /obj/item/clothing/glasses/regular/betterunshit, // SKYRAT EDIT ADDITION
))
modular_skyrat/modules/customization/modules/clothing/glasses/glasses.dm
+1 -1
View File
@@ -43,7 +43,7 @@
inhand_icon_state = "glasses"
clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED)
/obj/item/clothing/glasses/betterunshit
/obj/item/clothing/glasses/regular/betterunshit
name = "modern glasses"
desc = "After Nerd. Co went bankrupt for tax evasion and invasion, they were bought out by Dork.Co, who revamped their classic design."
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/eyes.dmi'
modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm
+1 -1
View File
@@ -61,7 +61,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla
/datum/loadout_item/glasses/prescription_glasses/better
name = "Modern Glasses"
item_path = /obj/item/clothing/glasses/betterunshit
item_path = /obj/item/clothing/glasses/regular/betterunshit
/*
* COSMETIC GLASSES
modular_skyrat/modules/modular_ert/code/pizza/pizza_outfit.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "Pizza Delivery Boy"
id = /obj/item/card/id/advanced/centcom/ert
suit = /obj/item/clothing/suit/toggle/jacket/hoodie/pizza
glasses = /obj/item/clothing/glasses/betterunshit
glasses = /obj/item/clothing/glasses/regular/betterunshit
head = /obj/item/clothing/head/soft/red
mask = /obj/item/clothing/mask/fakemoustache/italian
uniform = /obj/item/clothing/under/pizza
modular_skyrat/modules/modular_vending/code/clothesmate.dm
+1 -1
View File
@@ -40,7 +40,7 @@
/obj/item/clothing/neck/long_cape = 5,
/obj/item/clothing/neck/wide_cape = 5,
/obj/item/clothing/neck/robe_cape = 5,
/obj/item/clothing/glasses/betterunshit = 5,
/obj/item/clothing/glasses/regular/betterunshit = 5,
/obj/item/clothing/glasses/thin = 5,
/obj/item/clothing/glasses/hud/ar/projector = 5,
/obj/item/clothing/neck/face_scarf = 5,
modular_skyrat/modules/opposing_force/code/equipment/clothing.dm
+1 -1
View File
@@ -149,7 +149,7 @@
new /obj/item/clothing/suit/toggle/jacket/hoodie/pizza(src)
new /obj/item/clothing/head/pizza(src)
new /obj/item/clothing/head/soft/red(src)
new /obj/item/clothing/glasses/betterunshit(src)
new /obj/item/clothing/glasses/regular/betterunshit(src)
new /obj/item/clothing/mask/fakemoustache/italian(src)
new /obj/item/clothing/shoes/sneakers/red(src)
new /obj/item/radio/headset/headset_cent/impostorsr(src)