cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-15 00:53:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds jani HUDs from Baystation! (#22654)

Browse Source 
* Adds jani HUDs from Baystation!

* wrong place

* tweak to sprite

* contra review and tmeporary tweaks to the sprite

* finishing the sprites

* tweak to icon alpha and nv sprite

* typo

* conflict part 2

* test

* final adjustments

* DgamerL review

* fixing sprites

* changing name

* name part 2

* DGamerL review part 2

* wrong value

* nope

* equipment and janitorial categories

* Apply suggestions from code review
This commit is contained in:
Henri215
2023-12-11 13:52:54 -03:00
committed by GitHub
parent 08b071ba41
commit 94cefac7cb
18 changed files with 137 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/glasses/hudglasses.dm
+29
View File
@@ -235,3 +235,32 @@
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/eyes.dmi'
)
/obj/item/clothing/glasses/hud/janitor
name = "janitor HUD"
desc = "A heads-up display that scans for messes and alerts the user. Good for finding puddles hiding under catwalks."
icon_state = "janihud"
hud_types = DATA_HUD_JANITOR
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
"Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/eyes.dmi'
)
/obj/item/clothing/glasses/hud/janitor/sunglasses
name = "janitor HUD sunglasses"
desc = "Sunglasses with a build-in filth scanner, scans for messes and alerts the user."
icon_state = "sunhudjani"
see_in_dark = 1
flash_protect = FLASH_PROTECTION_FLASH
tint = FLASH_PROTECTION_FLASH
/obj/item/clothing/glasses/hud/janitor/night
name = "night vision janitor HUD"
desc = "A janitorial filth scanner fitted with a light amplifier."
icon_state = "nvjanihud"
origin_tech = "magnets=4;biotech=4;plasmatech=4;engineering=5"
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
code/modules/crafting/tailoring.dm
+18
View File
@@ -194,6 +194,24 @@
reqs = list(/obj/item/clothing/glasses/hud/diagnostic/sunglasses = 1)
category = CAT_CLOTHING
/datum/crafting_recipe/hudsunjani
name = "Janitor HUD sunglasses"
result = list(/obj/item/clothing/glasses/hud/janitor/sunglasses)
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/hud/janitor = 1,
/obj/item/clothing/glasses/sunglasses = 1,
/obj/item/stack/cable_coil = 5)
category = CAT_CLOTHING
/datum/crafting_recipe/hudsunjaniremoval
name = "Janitor HUD sunglasses removal"
result = list(/obj/item/clothing/glasses/sunglasses, /obj/item/clothing/glasses/hud/janitor)
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/hud/janitor/sunglasses = 1)
category = CAT_CLOTHING
/datum/crafting_recipe/beergoggles
name = "Sunscanners"
result = list(/obj/item/clothing/glasses/sunglasses/reagent)
code/modules/mob/living/silicon/silicon_mob.dm
+10
View File
@@ -40,6 +40,7 @@
var/med_hud = DATA_HUD_MEDICAL_ADVANCED //Determines the med hud to use
var/sec_hud = DATA_HUD_SECURITY_ADVANCED //Determines the sec hud to use
var/d_hud = DATA_HUD_DIAGNOSTIC_BASIC //There is only one kind of diag hud
var/jani_hud = DATA_HUD_JANITOR
/mob/living/silicon/New()
GLOB.silicon_mob_list |= src
@@ -350,9 +351,11 @@
var/datum/atom_hud/secsensor = GLOB.huds[sec_hud]
var/datum/atom_hud/medsensor = GLOB.huds[med_hud]
var/datum/atom_hud/diagsensor = GLOB.huds[d_hud]
var/datum/atom_hud/janisensor = GLOB.huds[jani_hud]
secsensor.remove_hud_from(src)
medsensor.remove_hud_from(src)
diagsensor.remove_hud_from(src)
janisensor.remove_hud_from(src)
/mob/living/silicon/proc/add_sec_hud()
@@ -367,12 +370,16 @@
var/datum/atom_hud/diagsensor = GLOB.huds[d_hud]
diagsensor.add_hud_to(src)
/mob/living/silicon/proc/add_jani_hud()
var/datum/atom_hud/janisensor = GLOB.huds[jani_hud]
janisensor.add_hud_to(src)
/mob/living/silicon/proc/toggle_sensor_mode()
to_chat(src, "<span class='notice'>Please select sensor type.</span>")
var/static/list/sensor_choices = list("Security" = image(icon = 'icons/obj/clothing/glasses.dmi', icon_state = "securityhud"),
"Medical" = image(icon = 'icons/obj/clothing/glasses.dmi', icon_state = "healthhud"),
"Diagnostic" = image(icon = 'icons/obj/clothing/glasses.dmi', icon_state = "diagnostichud"),
"Janitor" = image(icon = 'icons/obj/clothing/glasses.dmi', icon_state = "janihud"),
"None" = image(icon = 'icons/mob/screen_gen.dmi', icon_state = "x"))
var/sensor_type = show_radial_menu(src, src, sensor_choices)
if(!sensor_type)
@@ -388,6 +395,9 @@
if("Diagnostic")
add_diag_hud()
to_chat(src, "<span class='notice'>Robotics diagnostic overlay enabled.</span>")
if("Janitor")
add_jani_hud()
to_chat(src, "<span class='notice'>Janitorial filth overlay enabled.</span>")
if("None")
to_chat(src, "Sensor augmentations disabled.")
code/modules/research/designs/equipment_designs.dm
+20
View File
@@ -81,6 +81,26 @@
build_path = /obj/item/clothing/glasses/hud/skills
category = list("Equipment")
/datum/design/jani_hud
name = "Janitor HUD"
desc = "A heads-up display that scans for messes and alerts the user. Good for finding puddles hiding under catwalks."
id = "jani_hud"
req_tech = list("biotech" = 2, "magnets" = 3)
build_type = PROTOLATHE
materials = list(MAT_METAL = 500, MAT_GLASS = 500)
build_path = /obj/item/clothing/glasses/hud/janitor
category = list("Equipment", "Janitorial")
/datum/design/jani_night_vision_goggles
name = "Night Vision Janitor HUD"
desc = "A janitorial filth scanner fitted with a light amplifier."
id = "night_vision_jani"
req_tech = list("biotech" = 4, "magnets" = 5, "plasmatech" = 4, "engineering" = 6)
build_type = PROTOLATHE
materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_PLASMA = 350, MAT_URANIUM = 1000)
build_path = /obj/item/clothing/glasses/hud/janitor/night
category = list("Equipment", "Janitorial")
/datum/design/mesons
name = "Optical Meson Scanners"
desc = "Used for seeing walls, floors, and stuff through anything."
code/modules/research/designs/medical_designs.dm
+11
View File
@@ -386,6 +386,17 @@
build_path = /obj/item/organ/internal/cyberimp/arm/toolset_abductor
category = list("Medical")
/datum/design/cyberimp_jani_hud
name = "Janitor HUD Implant"
desc = "These cybernetic eye implants will display a filth HUD over everything you see. Wiggle eyes to control."
id = "ci-janihud"
req_tech = list("materials" = 5, "engineering" = 4, "programming" = 4, "biotech" = 4)
build_type = PROTOLATHE | MECHFAB
construction_time = 5 SECONDS
materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_SILVER = 500, MAT_GOLD = 500)
build_path = /obj/item/organ/internal/cyberimp/eyes/hud/jani
category = list("Medical")
/datum/design/cyberimp_diagnostic_hud
name = "Diagnostic HUD Implant"
desc = "These cybernetic eye implants will display a diagnostic HUD over everything you see. Wiggle eyes to control."
code/modules/response_team/ert_outfits.dm
+5 -4
View File
@@ -498,7 +498,7 @@
backpack_contents = list(
/obj/item/grenade/chem_grenade/antiweed = 2,
/obj/item/push_broom,
/obj/item/push_broom = 1,
/obj/item/storage/box/lights/mixed = 1,
/obj/item/melee/flyswatter = 1
)
@@ -507,7 +507,7 @@
name = "RT Janitor (Amber)"
suit = /obj/item/clothing/suit/armor/vest/ert/janitor
head = /obj/item/clothing/head/helmet/ert/janitor
glasses = /obj/item/clothing/glasses/sunglasses
glasses = /obj/item/clothing/glasses/hud/janitor/sunglasses
r_pocket = /obj/item/flashlight/seclite
suit_store = /obj/item/gun/energy/disabler
@@ -518,12 +518,13 @@
/datum/outfit/job/centcom/response_team/janitorial/red
name = "RT Janitor (Red)"
suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
glasses = /obj/item/clothing/glasses/hud/janitor/sunglasses
shoes = /obj/item/clothing/shoes/galoshes/dry/lightweight
r_pocket = /obj/item/scythe/tele
suit_store = /obj/item/gun/energy/gun
cybernetic_implants = list(
/obj/item/organ/internal/cyberimp/eyes/hud/security,
/obj/item/organ/internal/cyberimp/arm/janitorial/advanced,
/obj/item/organ/internal/cyberimp/chest/nutriment/hardened
)
@@ -535,7 +536,7 @@
/datum/outfit/job/centcom/response_team/janitorial/gamma
name = "RT Janitor (Gamma)"
glasses = /obj/item/clothing/glasses/night
glasses = /obj/item/clothing/glasses/hud/janitor/night
back = /obj/item/mod/control/pre_equipped/responsory/janitor
r_pocket = /obj/item/scythe/tele
shoes = /obj/item/clothing/shoes/magboots/elite
code/modules/surgery/organs/augments_eyes.dm
+8
View File
@@ -61,3 +61,11 @@
aug_message = "Job indicator icons pop up in your vision. That is not a certified surgeon..."
HUD_type = DATA_HUD_SECURITY_ADVANCED
examine_extensions = list(EXAMINE_HUD_SECURITY_READ)
/obj/item/organ/internal/cyberimp/eyes/hud/jani
name = "Janitor HUD implant"
desc = "These cybernetic eye implants will display a filth HUD over everything you see."
implant_color = "#AF00AF"
origin_tech = "materials=4;engineering=4;biotech=4"
aug_message = "You scan for filth spots around you..."
HUD_type = DATA_HUD_JANITOR