diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index ca9c7e69447..4243b7841ce 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -843,10 +843,10 @@ /obj/item/clothing/suit/wizrobe/marisa/fake = 1,/obj/item/clothing/under/sundress = 1,/obj/item/clothing/head/witchwig = 1,/obj/item/weapon/staff/broom = 1, /obj/item/clothing/suit/wizrobe/fake = 1,/obj/item/clothing/head/wizard/fake = 1,/obj/item/weapon/staff = 3,/obj/item/clothing/mask/gas/sexyclown = 1, /obj/item/clothing/under/sexyclown = 1,/obj/item/clothing/mask/gas/sexymime = 1,/obj/item/clothing/under/sexymime = 1,/obj/item/clothing/suit/apron/overalls = 1, - /obj/item/clothing/head/rabbitears =1, /obj/item/clothing/head/sombrero = 1, /obj/item/clothing/head/sombrero/green = 1, /obj/item/clothing/suit/poncho = 1, - /obj/item/clothing/suit/poncho/green = 1, /obj/item/clothing/suit/poncho/red = 1, - /obj/item/clothing/under/maid = 1, /obj/item/clothing/under/janimaid = 1,/obj/item/clothing/glasses/cold=1,/obj/item/clothing/glasses/heat=1) - contraband = list(/obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 1) + /obj/item/clothing/head/rabbitears =1,/obj/item/clothing/head/sombrero = 1,/obj/item/clothing/head/sombrero/green = 1,/obj/item/clothing/suit/poncho = 1, + /obj/item/clothing/suit/poncho/green = 1,/obj/item/clothing/suit/poncho/red = 1,/obj/item/clothing/glasses/sunglasses/gar = 1, + /obj/item/clothing/under/maid = 1,/obj/item/clothing/under/janimaid = 1,/obj/item/clothing/glasses/cold=1,/obj/item/clothing/glasses/heat=1) + contraband = list(/obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 1,/obj/item/clothing/glasses/sunglasses/garb = 1) premium = list(/obj/item/clothing/suit/hgpirate = 1, /obj/item/clothing/head/hgpiratecap = 1, /obj/item/clothing/head/helmet/roman = 1, /obj/item/clothing/head/helmet/roman/legionaire = 1, /obj/item/clothing/under/roman = 1, /obj/item/clothing/shoes/roman = 1, /obj/item/weapon/shield/riot/roman = 1) refill_canister = /obj/item/weapon/vending_refill/autodrobe diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 59928592fa7..f652d6fb2b5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -24,6 +24,7 @@ new /obj/item/weapon/cartridge/captain(src) new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/device/radio/headset/heads/captain/alt(src) + new /obj/item/clothing/glasses/sunglasses/gar/supergar(src) new /obj/item/clothing/gloves/color/captain(src) new /obj/item/weapon/gun/energy/gun(src) return @@ -79,6 +80,7 @@ new /obj/item/clothing/under/rank/head_of_security/alt(src) new /obj/item/clothing/head/HoS(src) new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src) + new /obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars(src) new /obj/item/weapon/storage/lockbox/loyalty(src) new /obj/item/weapon/storage/box/flashbangs(src) new /obj/item/device/megaphone/sec(src) diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 2dc8971664c..0c68c23e81e 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -15,6 +15,16 @@ item_state = "nvgmeson" darkness_view = 8 +/obj/item/clothing/glasses/meson/gar + name = "Gar Mesons" + icon_state = "garm" + item_state = "garm" + desc = "Do the impossible, see the invisible!" + force = 10 + throwforce = 10 + attack_verb = list("sliced") + hitsound = 'sound/weapons/bladeslice.ogg' + /obj/item/clothing/glasses/science name = "Science Goggles" desc = "A pair of snazzy goggles used to protect against chemical spills." @@ -78,6 +88,42 @@ flash_protect = 1 tint = 1 +/obj/item/clothing/glasses/sunglasses/garb + desc = "Go beyond impossible and kick reason to the curb!" + name = "black gar glasses" + icon_state = "garb" + item_state = "garb" + force = 10 + throwforce = 10 + attack_verb = list("sliced") + hitsound = 'sound/weapons/bladeslice.ogg' + +/obj/item/clothing/glasses/sunglasses/garb/supergarb + desc = "Believe in us humans." + name = "black super gar glasses" + icon_state = "supergarb" + item_state = "garb" + force = 12 + throwforce = 12 + +/obj/item/clothing/glasses/sunglasses/gar + desc = "Just who the hell do you think I am?!" + name = "gar glasses" + icon_state = "gar" + item_state = "gar" + force = 10 + throwforce = 10 + attack_verb = list("sliced") + hitsound = 'sound/weapons/bladeslice.ogg' + +/obj/item/clothing/glasses/sunglasses/gar/supergar + desc = "We evolve past the person we were a minute before. Little by little we advance with each turn. That's how a drill works!" + name = "super gar glasses" + icon_state = "supergar" + item_state = "gar" + force = 12 + throwforce = 12 + /obj/item/clothing/glasses/welding name = "welding goggles" desc = "Protects the eyes from welders; approved by the mad scientist association." diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 012a260bba5..a31a77f32ba 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -65,3 +65,20 @@ emagged = 1 desc = desc + " The display flickers slightly." +/obj/item/clothing/glasses/hud/security/sunglasses/gars + name = "HUD GAR glasses" + desc = "GAR glasses with a HUD." + icon_state = "gars" + item_state = "garb" + force = 10 + throwforce = 10 + attack_verb = list("sliced") + hitsound = 'sound/weapons/bladeslice.ogg' + +/obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars + name = "SUPER HUD GAR glasses" + desc = "SUPER GAR glasses with a HUD." + icon_state = "supergars" + item_state = "garb" + force = 12 + throwforce = 12 \ No newline at end of file diff --git a/html/changelogs/dannno-gar.yml b/html/changelogs/dannno-gar.yml new file mode 100644 index 00000000000..0492c9ba7b7 --- /dev/null +++ b/html/changelogs/dannno-gar.yml @@ -0,0 +1,6 @@ +author: Dannno + +delete-after: True + +changes: + - rscadd: "GAR glasses return. Yes, I got permission. Just who the hell do you think I am?" diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index fb5701beda5..e3229507a35 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi index df394b37f25..269ec744d08 100644 Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi index 0ad3c2436b7..00f5e23eb0e 100644 Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index add817f4c74..86209503cd1 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ