mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 06:29:23 +01:00
This reverts commit 774824da18.
This commit is contained in:
Gandalf
@@ -333,7 +333,6 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
|
||||
new/datum/stack_recipe("white beanie", /obj/item/clothing/head/beanie, 2), \
|
||||
null, \
|
||||
new/datum/stack_recipe("blindfold", /obj/item/clothing/glasses/blindfold, 2), \
|
||||
new/datum/stack_recipe("eyepatch wrap", /obj/item/clothing/glasses/eyepatch/wrap, 2), /*SKYRAT EDIT ADDITION*/ \
|
||||
null, \
|
||||
new/datum/stack_recipe("19x19 canvas", /obj/item/canvas/nineteen_nineteen, 3), \
|
||||
new/datum/stack_recipe("23x19 canvas", /obj/item/canvas/twentythree_nineteen, 4), \
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 3.5 KiB |
@@ -18,6 +18,10 @@
|
||||
name = "Eyepatch"
|
||||
path = /obj/item/clothing/glasses/eyepatch
|
||||
|
||||
/datum/loadout_item/glasses/eyepatchright
|
||||
name = "Right Eyepatch"
|
||||
path = /obj/item/clothing/glasses/eyepatch/right
|
||||
|
||||
/datum/loadout_item/glasses/heat
|
||||
name = "Heat goggles"
|
||||
path = /obj/item/clothing/glasses/heat
|
||||
@@ -54,38 +58,67 @@
|
||||
name = "Modern Glasses"
|
||||
path = /obj/item/clothing/glasses/betterunshit
|
||||
|
||||
/datum/loadout_item/glasses/eyewrap
|
||||
name = "Eyepatch Wrap"
|
||||
path = /obj/item/clothing/glasses/eyepatch/wrap
|
||||
|
||||
/datum/loadout_item/glasses/whiteeyepatch
|
||||
name = "White Eyepatch"
|
||||
path = /obj/item/clothing/glasses/eyepatch/white
|
||||
|
||||
/datum/loadout_item/glasses/medicpatch
|
||||
/datum/loadout_item/glasses/whiteeyepatchright
|
||||
name = "White Eyepatch"
|
||||
path = /obj/item/clothing/glasses/eyepatch/whiteright
|
||||
|
||||
|
||||
/datum/loadout_item/glasses/medic
|
||||
name = "Medical Eyepatch"
|
||||
path = /obj/item/clothing/glasses/hud/eyepatch/med
|
||||
path = /obj/item/clothing/glasses/hud/med/eyepatchsr
|
||||
restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist", "Paramedic")
|
||||
restricted_desc = "Medical"
|
||||
|
||||
/datum/loadout_item/glasses/robopatch
|
||||
/datum/loadout_item/glasses/medicright
|
||||
name = "Right Medical Eyepatch"
|
||||
path = /obj/item/clothing/glasses/hud/med/righteyepatchsr
|
||||
restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist", "Paramedic")
|
||||
restricted_desc = "lacideM"
|
||||
|
||||
/datum/loadout_item/glasses/robo
|
||||
name = "Diagnostic Eyepatch"
|
||||
path = /obj/item/clothing/glasses/hud/eyepatch/diagnostic
|
||||
path = /obj/item/clothing/glasses/hud/diagnostic/eyepatchsr
|
||||
restricted_roles = list("Scientist", "Roboticist", "Geneticist", "Research Director")
|
||||
restricted_desc = "Science"
|
||||
|
||||
/datum/loadout_item/glasses/scipatch
|
||||
/datum/loadout_item/glasses/roboright
|
||||
name = "Right Diagnostic Eyepatch"
|
||||
path = /obj/item/clothing/glasses/hud/diagnostic/righteyepatchsr
|
||||
restricted_roles = list("Scientist", "Roboticist", "Geneticist", "Research Director")
|
||||
restricted_desc = "ecneicS"
|
||||
|
||||
/datum/loadout_item/glasses/sci
|
||||
name = "Science Eyepatch"
|
||||
path = /obj/item/clothing/glasses/hud/eyepatch/sci
|
||||
path = /obj/item/clothing/glasses/hud/sci/eyepatchsr
|
||||
restricted_roles = list("Scientist", "Roboticist", "Geneticist", "Research Director", "Chemist")
|
||||
restricted_desc = "Science"
|
||||
|
||||
/datum/loadout_item/glasses/sciright
|
||||
name = "Right Science Eyepatch"
|
||||
path = /obj/item/clothing/glasses/hud/sci/righteyepatchsr
|
||||
restricted_roles = list("Scientist", "Roboticist", "Geneticist", "Research Director", "Chemist")
|
||||
restricted_desc = "ecneicS"
|
||||
|
||||
/datum/loadout_item/glasses/sechud
|
||||
name = "Security Hud"
|
||||
path = /obj/item/clothing/glasses/hud/security
|
||||
restricted_roles = list("Security Officer", "Security Sergeant", "Warden", "Head of Security")
|
||||
|
||||
/datum/loadout_item/glasses/secpatch
|
||||
/datum/loadout_item/glasses/sechud/eyepatch
|
||||
name = "Security Eyepatch Hud"
|
||||
path = /obj/item/clothing/glasses/hud/eyepatch/sec
|
||||
path = /obj/item/clothing/glasses/hud/sec/eyepatchsr
|
||||
restricted_roles = list("Security Officer", "Security Sergeant", "Warden", "Head of Security")
|
||||
|
||||
/datum/loadout_item/glasses/sechud/righteyepatch
|
||||
name = "Right Security Eyepatch Hud"
|
||||
path = /obj/item/clothing/glasses/hud/sec/righteyepatchsr
|
||||
restricted_roles = list("Security Officer", "Security Sergeant", "Warden", "Head of Security")
|
||||
restricted_desc = "ytiruceS"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,75 +1,10 @@
|
||||
/obj/item/clothing/glasses //Code to let you switch the side your eyepatch is on! Woo! Just an explanation, this is added to the base glasses so it works on eyepatch-huds too
|
||||
var/can_switch_eye = FALSE //Having this default to false means that its easy to make sure this doesnt apply to any pre-existing items
|
||||
var/current_eye = "_R" //Added to the end of the icon_state to make this easy code-wise, L and R being the wearer's Left and Right
|
||||
|
||||
/obj/item/clothing/glasses/CtrlClick(mob/user)
|
||||
. = ..()
|
||||
if(.)
|
||||
return
|
||||
if(!user.canUseTopic(src, BE_CLOSE, NO_DEXTERITY, FALSE, !iscyborg(user)))
|
||||
return
|
||||
else
|
||||
switcheye()
|
||||
|
||||
/obj/item/clothing/glasses/examine(mob/user)
|
||||
. = ..()
|
||||
if(can_switch_eye)
|
||||
if(current_eye == "_L")
|
||||
. += "Ctrl-click on [src] to wear it over your right eye."
|
||||
else
|
||||
. += "Ctrl-click on [src] to wear it over your left eye."
|
||||
|
||||
/obj/item/clothing/glasses/verb/eyepatch_switcheye()
|
||||
set name = "Switch Eyepatch Side"
|
||||
set category = null
|
||||
set src in usr
|
||||
switcheye()
|
||||
|
||||
/obj/item/clothing/glasses/proc/switcheye()
|
||||
if(!can_use(usr))
|
||||
return
|
||||
if(!can_switch_eye)
|
||||
to_chat(usr, "<span class='warning'>You cannot wear this any differently!</span>")
|
||||
return
|
||||
eyepatch_do_switch()
|
||||
if(current_eye == "_L")
|
||||
to_chat(usr, "<span class='notice'>You adjust the eyepatch to wear it over your left eye.</span>")
|
||||
else if(current_eye == "_R")
|
||||
to_chat(usr, "<span class='notice'>You adjust the eyepatch to wear it over your right eye.</span>")
|
||||
usr.update_inv_glasses()
|
||||
usr.update_overlays()
|
||||
|
||||
/obj/item/clothing/glasses/proc/eyepatch_do_switch()
|
||||
if(current_eye == "_L")
|
||||
current_eye = "_R"
|
||||
else if(current_eye == "_R")
|
||||
current_eye = "_L"
|
||||
src.icon_state = "[initial(icon_state)]"+ current_eye
|
||||
|
||||
/obj/item/clothing/glasses/Initialize()
|
||||
. = ..()
|
||||
icon_state += current_eye //Makes sure it spawns in with a sprite
|
||||
|
||||
/* ---------- Items Below ----------*/
|
||||
|
||||
/obj/item/clothing/glasses/eyepatch //Re-defined here for ease with the left/right switch
|
||||
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi'
|
||||
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi'
|
||||
can_switch_eye = TRUE
|
||||
|
||||
/obj/item/clothing/glasses/eyepatch/wrap
|
||||
name = "eye wrap"
|
||||
desc = "A glorified bandage. At least this one's actually made for your head..."
|
||||
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi'
|
||||
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi'
|
||||
icon_state = "eyewrap"
|
||||
|
||||
/obj/item/clothing/glasses/eyepatch/white
|
||||
name = "white eyepatch"
|
||||
desc = "This is what happens when a pirate gets a PhD."
|
||||
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi'
|
||||
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi'
|
||||
icon_state = "eyepatch_white"
|
||||
inhand_icon_state = "eyepatch"
|
||||
|
||||
/obj/item/clothing/glasses/thin
|
||||
name = "thin glasses"
|
||||
@@ -97,3 +32,20 @@
|
||||
icon_state = "binoclard_lenses"
|
||||
inhand_icon_state = "glasses_rimless"
|
||||
vision_correction = TRUE
|
||||
|
||||
/obj/item/clothing/glasses/eyepatch/right //if someone has more brain that I do, make these a...on click flip thing, please i dunno what i'm doing
|
||||
name = "right sided eyepatch"
|
||||
desc = ".rraY"
|
||||
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi'
|
||||
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi'
|
||||
icon_state = "eyepatch_1"
|
||||
inhand_icon_state = "eyepatch"
|
||||
|
||||
/obj/item/clothing/glasses/eyepatch/whiteright
|
||||
name = "right white eyepatch"
|
||||
desc = ".DhP a steg etarip a nehw sneppah tahw si sihT"
|
||||
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi'
|
||||
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi'
|
||||
icon_state = "eyepatch_white_1"
|
||||
inhand_icon_state = "eyepatch"
|
||||
|
||||
|
||||
@@ -1,38 +1,85 @@
|
||||
/obj/item/clothing/glasses/hud/eyepatch
|
||||
name = "eyepatch HUD"
|
||||
desc = "A simple HUD designed to interface with optical nerves of a lost eye. This one seems busted."
|
||||
/obj/item/clothing/glasses/hud/sec/eyepatchsr
|
||||
name = "Security Eyepatch Hud"
|
||||
desc = "Lost your eye beating an innocent clown? Thankfully your corporate overlords have made something to make up for this. May not do well against flashes."
|
||||
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi'
|
||||
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi'
|
||||
icon_state = "hudpatch"
|
||||
inhand_icon_state = "eyepatch"
|
||||
can_switch_eye = TRUE //See modular_skyrat\modules\customization\modules\clothing\glasses\glasses.dm
|
||||
|
||||
/obj/item/clothing/glasses/hud/eyepatch/sec
|
||||
name = "security eyepatch HUD"
|
||||
desc = "Lost your eye beating an innocent clown? Thankfully your corporate overlords have made something to make up for this. May not do well against flashes."
|
||||
icon_state = "hudpatch"
|
||||
hud_type = DATA_HUD_SECURITY_ADVANCED
|
||||
hud_trait = TRAIT_SECURITY_HUD
|
||||
glass_colour_type = /datum/client_colour/glass_colour/blue
|
||||
|
||||
/obj/item/clothing/glasses/hud/eyepatch/med
|
||||
name = "medical eyepatch HUD"
|
||||
/obj/item/clothing/glasses/hud/med/eyepatchsr
|
||||
name = "Medical Eyepatch Hud"
|
||||
desc = "Do no harm, maybe harm has befell to you, or your poor eyeball, thankfully there's a way to continue your oath, thankfully it didn't mention sleepdarts or monkey men."
|
||||
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi'
|
||||
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi'
|
||||
icon_state = "medpatch"
|
||||
inhand_icon_state = "eyepatch"
|
||||
hud_type = DATA_HUD_MEDICAL_ADVANCED
|
||||
hud_trait = TRAIT_MEDICAL_HUD
|
||||
glass_colour_type = /datum/client_colour/glass_colour/lightblue
|
||||
|
||||
/obj/item/clothing/glasses/hud/eyepatch/diagnostic
|
||||
name = "diagnostic eyepatch HUD"
|
||||
|
||||
/obj/item/clothing/glasses/hud/diagnostic/eyepatchsr
|
||||
name = "Diagnostic Eyepatch Hud"
|
||||
desc = "Lost your eyeball to a rogue borg? Dare to tell a Dogborg to do it's job? Got bored? Whatever the reason, this bit of tech will help you still repair borgs, they'll never need it since they usually do it themselves, but its the thought that counts."
|
||||
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi'
|
||||
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi'
|
||||
icon_state = "robopatch"
|
||||
inhand_icon_state = "eyepatch"
|
||||
hud_type = DATA_HUD_DIAGNOSTIC_BASIC
|
||||
hud_trait = TRAIT_DIAGNOSTIC_HUD
|
||||
glass_colour_type = /datum/client_colour/glass_colour/lightorange
|
||||
|
||||
/obj/item/clothing/glasses/hud/eyepatch/sci
|
||||
name = "science eyepatch HUD"
|
||||
desc = "Every few years, the aspiring mad scientist says to themselves 'I've got the castle, the evil laugh and equipment, but what I need is a look', thankfully, Dr. Galox has already covered that for you dear friend - while it doesn't do much beyond scan chemicals, what it lacks in use it makes up for in style."
|
||||
/obj/item/clothing/glasses/hud/sci/eyepatchsr
|
||||
name = "Science Eyepatch Hud"
|
||||
desc = "Every few years, the aspiring mad scientist says to themselves 'I've got the castle, the evil laugh and equipment, but what I need is a look', thankfully, Dr. Galox has already covered that for you dear friend, while it doesn't do much beyond scan chemicals, what it lacks in use it makes up for in style."
|
||||
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi'
|
||||
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi'
|
||||
icon_state = "scipatch"
|
||||
inhand_icon_state = "eyepatch"
|
||||
clothing_flags = SCAN_REAGENTS
|
||||
|
||||
/obj/item/clothing/glasses/hud/sec/righteyepatchsr
|
||||
name = "Right Security Eyepatch Hud"
|
||||
desc = ".sehsalf tsniaga llew od ton yaM .siht rof pu ekam ot gnihtemos edam evah sdrolrevo etaroproc ruoy yllufknahT ?nwolc tneconni na gnitaeb eye ruoy tsoL"
|
||||
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi'
|
||||
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi'
|
||||
icon_state = "hudpatch_1"
|
||||
inhand_icon_state = "eyepatch"
|
||||
hud_type = DATA_HUD_SECURITY_ADVANCED
|
||||
hud_trait = TRAIT_SECURITY_HUD
|
||||
glass_colour_type = /datum/client_colour/glass_colour/blue
|
||||
|
||||
/obj/item/clothing/glasses/hud/med/righteyepatchsr
|
||||
name = "Right Medical Eyepatch Hud"
|
||||
desc = ".nem yeknom ro stradpeels noitnem t'ndid ti yllufknaht ,htao ruoy eunitnoc ot yaw a s'ereht yllufknaht ,llabeye roop ruoy ro ,uoy ot llefeb sah mrah ebyam ,mrah on oD"
|
||||
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi'
|
||||
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi'
|
||||
icon_state = "medpatch_1"
|
||||
inhand_icon_state = "eyepatch"
|
||||
hud_type = DATA_HUD_MEDICAL_ADVANCED
|
||||
hud_trait = TRAIT_MEDICAL_HUD
|
||||
glass_colour_type = /datum/client_colour/glass_colour/lightblue
|
||||
|
||||
|
||||
/obj/item/clothing/glasses/hud/diagnostic/righteyepatchsr
|
||||
name = "Right Diagnostic Eyepatch Hud"
|
||||
desc = ".stnuoc taht thguoht eht sti tub ,sevlesmeht ti od yllausu yeht ecnis ti deen reven ll'yeht ,sgrob riaper llits uoy pleh lliw hcet fo tib siht ,nosaer eht revetahW ?derob toG ?boj s'ti od ot grobgoD a llet ot eraD ?grob eugor a ot llabeye ruoy tsoL"
|
||||
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi'
|
||||
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi'
|
||||
icon_state = "robopatch_1"
|
||||
inhand_icon_state = "eyepatch"
|
||||
hud_type = DATA_HUD_DIAGNOSTIC_BASIC
|
||||
hud_trait = TRAIT_DIAGNOSTIC_HUD
|
||||
glass_colour_type = /datum/client_colour/glass_colour/lightorange
|
||||
|
||||
/obj/item/clothing/glasses/hud/sci/righteyepatchsr
|
||||
name = "Right Science Eyepatch Hud"
|
||||
desc = ".elyts ni rof pu sekam ti esu ni skcal ti tahw ,slacimehc nacs dnoyeb hcum od t'nseod ti elihw ,dneirf raed uoy rof taht derevoc ydaerla sah xolaG .rD ,yllufknaht ,'kool a si deen I tahw tub ,tnempiuqe dna hgual live eht ,eltsac eht tog ev'I' sevlesmeht ot syas tsitneics dam gniripsa eht ,sraey wef yrevE"
|
||||
icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi'
|
||||
worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi'
|
||||
icon_state = "scipatch_1"
|
||||
inhand_icon_state = "eyepatch"
|
||||
clothing_flags = SCAN_REAGENTS
|
||||
|
||||
Reference in New Issue
Block a user