[NO GBP] Borgening fixes (#93026)

## About The Pull Request

closes #93025 and closes #93013
also gives borg thermals right icon, i acidentally used regular meson
icon before, and kills borg goggles items (forgot to do that)

## Why It's Good For The Game

because bugs smell

## Changelog

🆑
fix: Fixed meson and thermal view action for cyborgs
fix: You can't eject infinite toner from cyborg decal painter anymore.
del: Removed now unused cyborg meson and thermal goggles items.

/🆑
This commit is contained in:
Aliceee2ch
2025-09-21 21:07:49 +03:00
committed by GitHub
parent da91463bbe
commit 8cb8941485
6 changed files with 19 additions and 27 deletions

View File

@@ -28,7 +28,7 @@
/obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/workboots/mining,
/obj/item/clothing/gloves/color/black, /obj/item/clothing/gloves/color/black,
/obj/effect/mob_spawn/corpse/human/charredskeleton, /obj/effect/mob_spawn/corpse/human/charredskeleton,
/obj/item/borg/sight/meson, /obj/item/clothing/glasses/meson,
/obj/item/pickaxe/improvised, /obj/item/pickaxe/improvised,
/turf/open/misc/asteroid/basalt/airless, /turf/open/misc/asteroid/basalt/airless,
/area/ruin/unpowered/no_grav) /area/ruin/unpowered/no_grav)

View File

@@ -25,6 +25,7 @@
#define BORGTHERM (1<<1) #define BORGTHERM (1<<1)
#define BORGXRAY (1<<2) #define BORGXRAY (1<<2)
#define BORGMATERIAL (1<<3) #define BORGMATERIAL (1<<3)
#define BORGDEFAULT 0
//for clothing visor toggles, these determine which vars to toggle //for clothing visor toggles, these determine which vars to toggle
#define VISOR_FLASHPROTECT (1<<0) #define VISOR_FLASHPROTECT (1<<0)

View File

@@ -22,16 +22,6 @@
icon_state = "securityhudnight" icon_state = "securityhudnight"
sight_mode = BORGXRAY sight_mode = BORGXRAY
/obj/item/borg/sight/thermal
name = "\proper thermal vision"
sight_mode = BORGTHERM
icon_state = "thermal"
/obj/item/borg/sight/meson
name = "\proper meson vision"
sight_mode = BORGMESON
icon_state = "meson"
/obj/item/borg/sight/material /obj/item/borg/sight/material
name = "\proper material vision" name = "\proper material vision"
sight_mode = BORGMATERIAL sight_mode = BORGMATERIAL

View File

@@ -156,3 +156,6 @@
else if(cyborg.cell.charge <= 0) else if(cyborg.cell.charge <= 0)
balloon_alert(user, "not enough energy!") balloon_alert(user, "not enough energy!")
return return
/obj/item/airlock_painter/decal/cyborg/click_alt(mob/user)
return CLICK_ACTION_BLOCKING

View File

@@ -421,16 +421,12 @@
button_icon_state = "meson" button_icon_state = "meson"
/datum/action/cooldown/borg_meson/Activate() /datum/action/cooldown/borg_meson/Activate()
if(usr.sight & SEE_TURFS) var/mob/living/silicon/robot/borg = owner
usr.clear_sight(SEE_TURFS) if(borg.sight & SEE_TURFS)
owner.lighting_cutoff_red += 5 borg.sight_mode = BORGDEFAULT
owner.lighting_cutoff_green += 15
owner.lighting_cutoff_blue += 5
else else
usr.add_sight(SEE_TURFS) borg.sight_mode = BORGMESON
owner.lighting_cutoff_red -= 5 borg.update_sight()
owner.lighting_cutoff_green -= 15
owner.lighting_cutoff_blue -= 5
/obj/item/robot_model/engineering/be_transformed_to(obj/item/robot_model/old_model, forced = FALSE) /obj/item/robot_model/engineering/be_transformed_to(obj/item/robot_model/old_model, forced = FALSE)
var/datum/action/cooldown/borg_meson/night_vision = new(loc) var/datum/action/cooldown/borg_meson/night_vision = new(loc)
@@ -988,16 +984,15 @@
/datum/action/cooldown/borg_thermal /datum/action/cooldown/borg_thermal
name = "Toggle Thermal Night Vision" name = "Toggle Thermal Night Vision"
button_icon = 'icons/mob/actions/actions_mecha.dmi' button_icon = 'icons/mob/actions/actions_mecha.dmi'
button_icon_state = "meson" button_icon_state = "thermal"
/datum/action/cooldown/borg_thermal/Activate() /datum/action/cooldown/borg_thermal/Activate()
if(usr.sight & SEE_TURFS) var/mob/living/silicon/robot/borg = owner
usr.clear_sight(SEE_TURFS|SEE_MOBS) if(borg.sight & SEE_MOBS)
usr.lighting_cutoff = LIGHTING_CUTOFF_VISIBLE borg.sight_mode = BORGDEFAULT
else else
usr.add_sight(SEE_TURFS|SEE_MOBS) borg.sight_mode = BORGTHERM
usr.lighting_cutoff = LIGHTING_CUTOFF_HIGH borg.update_sight()
usr.sync_lighting_plane_cutoff()
/obj/item/robot_model/saboteur/be_transformed_to(obj/item/robot_model/old_model, forced = FALSE) /obj/item/robot_model/saboteur/be_transformed_to(obj/item/robot_model/old_model, forced = FALSE)
var/datum/action/cooldown/borg_thermal/thermal_vision = new(loc) var/datum/action/cooldown/borg_thermal/thermal_vision = new(loc)

View File

@@ -0,0 +1,3 @@
/obj/item/borg/sight/meson : @DELETE
/obj/item/borg/sight/thermal : @DELETE