From 7ee3b8548c3f36658a02bcd51b50466c65d426ab Mon Sep 17 00:00:00 2001 From: Onyxarias Date: Mon, 17 May 2021 15:20:58 -0700 Subject: [PATCH 1/4] Flashproofs sleek, adds species restrictions to others. --- .../client/preference/loadout/loadout_racial.dm | 16 ++++++++-------- code/modules/clothing/glasses/glasses.dm | 4 ++++ code/modules/clothing/glasses/hud.dm | 2 ++ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/code/modules/client/preference/loadout/loadout_racial.dm b/code/modules/client/preference/loadout/loadout_racial.dm index 0d7b945bb78..c3d4c0d50bc 100644 --- a/code/modules/client/preference/loadout/loadout_racial.dm +++ b/code/modules/client/preference/loadout/loadout_racial.dm @@ -5,42 +5,42 @@ /datum/gear/racial/taj display_name = "embroidered veil" - description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races." + description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. Cannot be worn by non-Tajaran" path = /obj/item/clothing/glasses/tajblind slot = slot_glasses /datum/gear/racial/taj/sec display_name = "sleek veil" - description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. This one has an in-built security HUD." + description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. This one has an in-built security HUD. Cannot be worn by non-Tajaran" path = /obj/item/clothing/glasses/hud/security/tajblind allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot", "Internal Affairs Agent", "Magistrate") cost = 2 /datum/gear/racial/taj/med display_name = "lightweight veil" - description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. This one has an in-built medical HUD." + description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. This one has an in-built medical HUD. Cannot be worn by non-Tajaran" path = /obj/item/clothing/glasses/hud/health/tajblind allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Brig Physician" , "Coroner") cost = 2 /datum/gear/racial/taj/sci display_name = "hi-tech veil" - description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races." + description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. Cannot be worn by non-Tajaran" path = /obj/item/clothing/glasses/tajblind/sci cost = 2 /datum/gear/racial/taj/eng display_name = "industrial veil" - description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races." + description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. Cannot be worn by non-Tajaran" path = /obj/item/clothing/glasses/tajblind/eng cost = 2 - + /datum/gear/racial/taj/cargo display_name = "khaki veil" - description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. It is light and comfy!" + description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. It is light and comfy! Cannot be worn by non-Tajaran" path = /obj/item/clothing/glasses/tajblind/cargo cost = 2 - + /datum/gear/racial/footwraps display_name = "cloth footwraps" path = /obj/item/clothing/shoes/footwraps diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index d07b95d18eb..f5f0e8bd3e2 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -487,6 +487,7 @@ desc = "An Ahdominian made veil that allows the user to see while obscuring their eyes." icon_state = "tajblind" item_state = "tajblind" + species_restricted = list("Tajaran") flags_cover = GLASSESCOVERSEYES actions_types = list(/datum/action/item_action/toggle) up = 0 @@ -502,16 +503,19 @@ name = "industrial veil" icon_state = "tajblind_engi" item_state = "tajblind_engi" + species_restricted = list("Tajaran") /obj/item/clothing/glasses/tajblind/sci name = "hi-tech veil" icon_state = "tajblind_sci" item_state = "tajblind_sci" + species_restricted = list("Tajaran") /obj/item/clothing/glasses/tajblind/cargo name = "khaki veil" icon_state = "tajblind_cargo" item_state = "tajblind_cargo" + species_restricted = list("Tajaran") /obj/item/clothing/glasses/tajblind/attack_self() toggle_veil() diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index f0dce270fb6..a6d85f1e9ae 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -171,6 +171,8 @@ desc = "An Ahdominian made veil that allows the user to see while obscuring their eyes. This one has an in-built security HUD." icon_state = "tajblind_sec" item_state = "tajblind_sec" + flash_protect = 1 + species_restricted = list("Tajaran") flags_cover = GLASSESCOVERSEYES actions_types = list(/datum/action/item_action/toggle) up = 0 From 10fd2da8c854bc48a9f171605eee8835919f985b Mon Sep 17 00:00:00 2001 From: Onyxarias Date: Wed, 19 May 2021 09:11:53 -0700 Subject: [PATCH 2/4] Removed taj racial restrictions. --- Paradise | 1 + .../client/preference/loadout/loadout_racial.dm | 12 ++++++------ code/modules/clothing/glasses/glasses.dm | 4 ---- code/modules/clothing/glasses/hud.dm | 1 - 4 files changed, 7 insertions(+), 11 deletions(-) create mode 160000 Paradise diff --git a/Paradise b/Paradise new file mode 160000 index 00000000000..7ee3b8548c3 --- /dev/null +++ b/Paradise @@ -0,0 +1 @@ +Subproject commit 7ee3b8548c3f36658a02bcd51b50466c65d426ab diff --git a/code/modules/client/preference/loadout/loadout_racial.dm b/code/modules/client/preference/loadout/loadout_racial.dm index c3d4c0d50bc..78d38cf87b5 100644 --- a/code/modules/client/preference/loadout/loadout_racial.dm +++ b/code/modules/client/preference/loadout/loadout_racial.dm @@ -5,39 +5,39 @@ /datum/gear/racial/taj display_name = "embroidered veil" - description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. Cannot be worn by non-Tajaran" + description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races." path = /obj/item/clothing/glasses/tajblind slot = slot_glasses /datum/gear/racial/taj/sec display_name = "sleek veil" - description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. This one has an in-built security HUD. Cannot be worn by non-Tajaran" + description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. This one has an in-built security HUD." path = /obj/item/clothing/glasses/hud/security/tajblind allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot", "Internal Affairs Agent", "Magistrate") cost = 2 /datum/gear/racial/taj/med display_name = "lightweight veil" - description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. This one has an in-built medical HUD. Cannot be worn by non-Tajaran" + description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. This one has an in-built medical HUD." path = /obj/item/clothing/glasses/hud/health/tajblind allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Brig Physician" , "Coroner") cost = 2 /datum/gear/racial/taj/sci display_name = "hi-tech veil" - description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. Cannot be worn by non-Tajaran" + description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races." path = /obj/item/clothing/glasses/tajblind/sci cost = 2 /datum/gear/racial/taj/eng display_name = "industrial veil" - description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. Cannot be worn by non-Tajaran" + description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races." path = /obj/item/clothing/glasses/tajblind/eng cost = 2 /datum/gear/racial/taj/cargo display_name = "khaki veil" - description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. It is light and comfy! Cannot be worn by non-Tajaran" + description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. It is light and comfy!" path = /obj/item/clothing/glasses/tajblind/cargo cost = 2 diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index f5f0e8bd3e2..d07b95d18eb 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -487,7 +487,6 @@ desc = "An Ahdominian made veil that allows the user to see while obscuring their eyes." icon_state = "tajblind" item_state = "tajblind" - species_restricted = list("Tajaran") flags_cover = GLASSESCOVERSEYES actions_types = list(/datum/action/item_action/toggle) up = 0 @@ -503,19 +502,16 @@ name = "industrial veil" icon_state = "tajblind_engi" item_state = "tajblind_engi" - species_restricted = list("Tajaran") /obj/item/clothing/glasses/tajblind/sci name = "hi-tech veil" icon_state = "tajblind_sci" item_state = "tajblind_sci" - species_restricted = list("Tajaran") /obj/item/clothing/glasses/tajblind/cargo name = "khaki veil" icon_state = "tajblind_cargo" item_state = "tajblind_cargo" - species_restricted = list("Tajaran") /obj/item/clothing/glasses/tajblind/attack_self() toggle_veil() diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index a6d85f1e9ae..8bc9efb0be1 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -172,7 +172,6 @@ icon_state = "tajblind_sec" item_state = "tajblind_sec" flash_protect = 1 - species_restricted = list("Tajaran") flags_cover = GLASSESCOVERSEYES actions_types = list(/datum/action/item_action/toggle) up = 0 From a78048534728e091861163aade704440dd12e9ca Mon Sep 17 00:00:00 2001 From: Onyxarias Date: Sun, 25 Jul 2021 06:52:51 -0700 Subject: [PATCH 3/4] Deletes Paradise Removes the second Repository folder from inside the main one, that was there for some reason. --- Paradise | 1 - 1 file changed, 1 deletion(-) delete mode 160000 Paradise diff --git a/Paradise b/Paradise deleted file mode 160000 index 7ee3b8548c3..00000000000 --- a/Paradise +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7ee3b8548c3f36658a02bcd51b50466c65d426ab From d7a313791acde3056d6ae7ed9d1981be6b871eec Mon Sep 17 00:00:00 2001 From: Onyxarias Date: Sun, 25 Jul 2021 07:23:14 -0700 Subject: [PATCH 4/4] Replaces "flash_protect = 1" with the proper define Replaces "flash_protect = 1" with the proper define --- code/modules/clothing/glasses/hud.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 8bc9efb0be1..9f4b4f4c834 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -171,7 +171,7 @@ desc = "An Ahdominian made veil that allows the user to see while obscuring their eyes. This one has an in-built security HUD." icon_state = "tajblind_sec" item_state = "tajblind_sec" - flash_protect = 1 + flash_protect = FLASH_PROTECTION_FLASH flags_cover = GLASSESCOVERSEYES actions_types = list(/datum/action/item_action/toggle) up = 0