cyberpresidentvanellope/Skyrat-tg
1
0
Fork 0
mirror of https://github.com/Skyrat-SS13/Skyrat-tg.git synced 2026-08-28 07:17:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Icon unit test fixes (#29530)

Browse Source 
* Fish

* Revert "[MIRROR] Shrunk arrow from pointing at things. Command roles unaffected thanks to id trims (also new skillchip). (#29461)"

This reverts commit e6e2af8b4c.

* asset protection fix
This commit is contained in:
Waterpig
2024-08-22 18:59:44 +02:00
committed by GitHub
parent 27c1004675
commit 0f1fced38f
26 changed files with 20 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/ai/oldhostile/hostile_tameable.dm
+3 -3
View File
@@ -77,14 +77,14 @@
if(pawn.Adjacent(pawn, new_friend))
new_friend.visible_message("<b>[pawn]</b> looks at [new_friend] in a friendly manner!", span_notice("[pawn] looks at you in a friendly manner!"))
set_blackboard_key(BB_HOSTILE_FRIEND, new_friend)
RegisterSignal(new_friend, COMSIG_MOVABLE_POINTED, PROC_REF(check_point))
RegisterSignal(new_friend, COMSIG_MOB_POINTED, PROC_REF(check_point))
RegisterSignal(new_friend, COMSIG_MOB_SAY, PROC_REF(check_verbal_command))
/// Someone is being mean to us, take them off our friends (add actual enemies behavior later)
/datum/ai_controller/hostile_friend/proc/unfriend()
var/mob/living/old_friend = blackboard[BB_HOSTILE_FRIEND]
if(old_friend)
UnregisterSignal(old_friend, list(COMSIG_MOVABLE_POINTED, COMSIG_MOB_SAY))
UnregisterSignal(old_friend, list(COMSIG_MOB_POINTED, COMSIG_MOB_SAY))
clear_blackboard_key(BB_HOSTILE_FRIEND)
/// Someone is looking at us, if we're currently carrying something then show what it is, and include a message if they're our friend
@@ -190,7 +190,7 @@
set_blackboard_key(BB_HOSTILE_ORDER_MODE, HOSTILE_COMMAND_ATTACK)
/// Someone we like is pointing at something, see if it's something we might want to interact with (like if they might want us to fetch something for them)
/datum/ai_controller/hostile_friend/proc/check_point(mob/pointing_friend, atom/movable/pointed_movable, obj/effect/temp_visual/point/point)
/datum/ai_controller/hostile_friend/proc/check_point(mob/pointing_friend, atom/movable/pointed_movable)
SIGNAL_HANDLER
var/mob/living/simple_animal/hostile/living_pawn = pawn
code/datums/components/pet_commands/pet_command.dm
+3 -3
View File
@@ -186,14 +186,14 @@
/datum/pet_command/point_targeting/add_new_friend(mob/living/tamer)
. = ..()
RegisterSignal(tamer, COMSIG_MOVABLE_POINTED, PROC_REF(on_point))
RegisterSignal(tamer, COMSIG_MOB_POINTED, PROC_REF(on_point))
/datum/pet_command/point_targeting/remove_friend(mob/living/unfriended)
. = ..()
UnregisterSignal(unfriended, COMSIG_MOVABLE_POINTED)
UnregisterSignal(unfriended, COMSIG_MOB_POINTED)
/// Target the pointed atom for actions
/datum/pet_command/point_targeting/proc/on_point(mob/living/friend, atom/pointed_atom, obj/effect/temp_visual/point/point)
/datum/pet_command/point_targeting/proc/on_point(mob/living/friend, atom/pointed_atom)
SIGNAL_HANDLER
var/mob/living/parent = weak_parent.resolve()
code/datums/components/riding/riding_mob.dm
+3 -3
View File
@@ -540,9 +540,9 @@
/datum/component/riding/creature/leaper/Initialize(mob/living/riding_mob, force = FALSE, ride_check_flags = NONE, potion_boost = FALSE)
. = ..()
RegisterSignal(riding_mob, COMSIG_MOVABLE_POINTED, PROC_REF(attack_pointed))
RegisterSignal(riding_mob, COMSIG_MOB_POINTED, PROC_REF(attack_pointed))
/datum/component/riding/creature/leaper/proc/attack_pointed(mob/living/rider, atom/pointed, obj/effect/temp_visual/point/point)
/datum/component/riding/creature/leaper/proc/attack_pointed(mob/living/rider, atom/pointed)
SIGNAL_HANDLER
if(!isclosedturf(pointed))
return
@@ -554,7 +554,7 @@
/datum/component/riding/leaper/handle_unbuckle(mob/living/rider)
. = ..()
UnregisterSignal(rider, COMSIG_MOVABLE_POINTED)
UnregisterSignal(rider, COMSIG_MOB_POINTED)
/datum/component/riding/creature/raptor
require_minigame = TRUE
code/datums/id_trim/_id_trim.dm
-5
View File
@@ -24,11 +24,6 @@
/// Accesses that this trim unlocks on a card that require wildcard slots to apply. If a card cannot accept all a trim's wildcard accesses, the card is incompatible with the trim.
var/list/wildcard_access = list()
///If true, IDs with this trim will grant wearers with bigger arrows when pointing
var/big_pointer = FALSE
///If set, IDs with this trim will give wearers arrows of different colors when pointing
var/pointer_color
/// Returns the SecHUD job icon state for whatever this object's ID card is, if it has one.
/obj/item/proc/get_sechud_job_icon_state()
var/obj/item/card/id/id_card = GetID()
code/datums/id_trim/admin.dm
-2
View File
@@ -5,8 +5,6 @@
department_color = COLOR_CENTCOM_BLUE
subdepartment_color = COLOR_SERVICE_LIME
threat_modifier = -INFINITY
big_pointer = TRUE
pointer_color = COLOR_GREEN
/datum/id_trim/admin/New()
. = ..()
code/datums/id_trim/centcom.dm
-16
View File
@@ -7,8 +7,6 @@
department_color = COLOR_CENTCOM_BLUE
subdepartment_color = COLOR_CENTCOM_BLUE
threat_modifier = -10 // Centcom are legally allowed to do whatever they want
big_pointer = TRUE
pointer_color = COLOR_CENTCOM_BLUE
/// Trim for Centcom VIPs
/datum/id_trim/centcom/vip
@@ -22,7 +20,6 @@
trim_state = "trim_janitor"
department_color = COLOR_CENTCOM_BLUE
subdepartment_color = COLOR_SERVICE_LIME
big_pointer = FALSE
/// Trim for Centcom Thunderdome Overseers.
/datum/id_trim/centcom/thunderdome_overseer
@@ -38,12 +35,10 @@
/datum/id_trim/centcom/intern
access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_WEAPONS)
assignment = "CentCom Intern"
big_pointer = FALSE
/// Trim for Centcom Head Interns. Different assignment, common station access added on.
/datum/id_trim/centcom/intern/head
assignment = "CentCom Head Intern"
big_pointer = TRUE
/datum/id_trim/centcom/intern/head/New()
. = ..()
@@ -54,13 +49,11 @@
/datum/id_trim/centcom/bounty_hunter
access = list(ACCESS_CENT_GENERAL)
assignment = "Bounty Hunter"
big_pointer = FALSE
/// Trim for Centcom Bartenders.
/datum/id_trim/centcom/bartender
access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_BAR)
assignment = JOB_CENTCOM_BARTENDER
big_pointer = FALSE
/// Trim for Centcom Medical Officers.
/datum/id_trim/centcom/medical_officer
@@ -75,7 +68,6 @@
/// Trim for Centcom Specops Officers. All Centcom and Station Access.
/datum/id_trim/centcom/specops_officer
assignment = JOB_CENTCOM_SPECIAL_OFFICER
big_pointer = FALSE
/datum/id_trim/centcom/specops_officer/New()
. = ..()
@@ -137,7 +129,6 @@
trim_state = "trim_securityofficer"
subdepartment_color = COLOR_SECURITY_RED
sechud_icon_state = SECHUD_SECURITY_RESPONSE_OFFICER
big_pointer = FALSE
/datum/id_trim/centcom/ert/security/New()
. = ..()
@@ -150,7 +141,6 @@
trim_state = "trim_stationengineer"
subdepartment_color = COLOR_ENGINEERING_ORANGE
sechud_icon_state = SECHUD_ENGINEERING_RESPONSE_OFFICER
big_pointer = FALSE
/datum/id_trim/centcom/ert/engineer/New()
. = ..()
@@ -163,7 +153,6 @@
trim_state = "trim_medicaldoctor"
subdepartment_color = COLOR_MEDICAL_BLUE
sechud_icon_state = SECHUD_MEDICAL_RESPONSE_OFFICER
big_pointer = FALSE
/datum/id_trim/centcom/ert/medical/New()
. = ..()
@@ -176,7 +165,6 @@
trim_state = "trim_chaplain"
subdepartment_color = COLOR_SERVICE_LIME
sechud_icon_state = SECHUD_RELIGIOUS_RESPONSE_OFFICER
big_pointer = FALSE
/datum/id_trim/centcom/ert/chaplain/New()
. = ..()
@@ -189,7 +177,6 @@
trim_state = "trim_ert_janitor"
subdepartment_color = COLOR_SERVICE_LIME
sechud_icon_state = SECHUD_JANITORIAL_RESPONSE_OFFICER
big_pointer = FALSE
/datum/id_trim/centcom/ert/janitor/New()
. = ..()
@@ -202,7 +189,6 @@
trim_state = "trim_clown"
subdepartment_color = COLOR_MAGENTA
sechud_icon_state = SECHUD_ENTERTAINMENT_RESPONSE_OFFICER
big_pointer = FALSE
/datum/id_trim/centcom/ert/clown/New()
. = ..()
@@ -211,8 +197,6 @@
/datum/id_trim/centcom/ert/militia
assignment = "Frontier Militia"
big_pointer = FALSE
/datum/id_trim/centcom/ert/militia/general
assignment = "Frontier Militia General"
big_pointer = TRUE
code/datums/id_trim/jobs.dm
-17
View File
@@ -238,8 +238,6 @@
ACCESS_CHANGE_IDS,
)
job = /datum/job/captain
big_pointer = TRUE
pointer_color = COLOR_COMMAND_BLUE
/// Captain gets all station accesses hardcoded in because it's the Captain.
/datum/id_trim/job/captain/New()
@@ -362,8 +360,6 @@
ACCESS_CHANGE_IDS,
)
job = /datum/job/chief_engineer
big_pointer = TRUE
pointer_color = COLOR_ENGINEERING_ORANGE
/datum/id_trim/job/chief_medical_officer
assignment = JOB_CHIEF_MEDICAL_OFFICER
@@ -403,8 +399,6 @@
ACCESS_CHANGE_IDS,
)
job = /datum/job/chief_medical_officer
big_pointer = TRUE
pointer_color = COLOR_MEDICAL_BLUE
/datum/id_trim/job/clown
assignment = JOB_CLOWN
@@ -618,8 +612,6 @@
ACCESS_CHANGE_IDS,
)
job = /datum/job/head_of_personnel
big_pointer = TRUE
pointer_color = COLOR_SERVICE_LIME
/datum/id_trim/job/head_of_security
assignment = JOB_HEAD_OF_SECURITY
@@ -669,8 +661,6 @@
ACCESS_CHANGE_IDS,
)
job = /datum/job/head_of_security
big_pointer = TRUE
pointer_color = COLOR_SECURITY_RED
/datum/id_trim/job/head_of_security/refresh_trim_access()
. = ..()
@@ -903,8 +893,6 @@
ACCESS_CHANGE_IDS,
)
job = /datum/job/quartermaster
big_pointer = TRUE
pointer_color = COLOR_CARGO_BROWN
/datum/id_trim/job/research_director
assignment = JOB_RESEARCH_DIRECTOR
@@ -953,8 +941,6 @@
ACCESS_CHANGE_IDS,
)
job = /datum/job/research_director
big_pointer = TRUE
pointer_color = COLOR_SCIENCE_PINK
/datum/id_trim/job/roboticist
assignment = JOB_ROBOTICIST
@@ -1220,7 +1206,6 @@
extra_access = list()
template_access = list()
job = /datum/job/veteran_advisor
big_pointer = TRUE
/datum/id_trim/job/veteran_advisor/refresh_trim_access()
. = ..()
@@ -1290,5 +1275,3 @@
extra_access = list()
template_access = list()
job = /datum/job/human_ai
big_pointer = TRUE
pointer_color = COLOR_MODERATE_BLUE
code/datums/id_trim/ruins.dm
+2 -8
View File
@@ -72,7 +72,6 @@
/datum/id_trim/centcom/corpse/commander
assignment = "Commander"
access = list(ACCESS_CENT_CAPTAIN, ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_STORAGE)
big_pointer = TRUE
/// Trim for various Centcom corpses.
/datum/id_trim/centcom/corpse/private_security
@@ -116,14 +115,12 @@
/datum/id_trim/pirate/captain
assignment = "Pirate Captain"
trim_state = "trim_captain"
big_pointer = TRUE
/datum/id_trim/pirate/silverscale
assignment = "Silver Scale Member"
/datum/id_trim/pirate/captain/silverscale
assignment = "Silver Scale VIP"
big_pointer = TRUE
//Trims for Dangerous Research, used in ``dangerous_research.dm``
/datum/id_trim/away/dangerous_research
@@ -133,7 +130,6 @@
/datum/id_trim/away/dangerous_research/head_occultist
assignment = "Head Occultist"
access = list(ACCESS_AWAY_SCIENCE, ACCESS_AWAY_COMMAND)
big_pointer = TRUE
//Trims for waystation.dmm space ruin
/datum/id_trim/away/waystation/cargo_technician
@@ -147,7 +143,6 @@
trim_state = "trim_quartermaster"
department_color = COLOR_CARGO_BROWN
access = list(ACCESS_AWAY_SUPPLY, ACCESS_AWAY_COMMAND)
big_pointer = TRUE
/datum/id_trim/away/waystation/security
assignment = "Waystation Security Officer"
@@ -167,9 +162,8 @@
/datum/id_trim/away/the_outlet/mad_manager
assignment = "The Mad Manager"
access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MEDICAL, ACCESS_AWAY_SEC)
big_pointer = TRUE
//Haunted Trading Post IDs
//Haunted Trading Post IDs //
/datum/id_trim/away/hauntedtradingpost
assignment = "Donk Co. Employee"
department_color = COLOR_ENGINEERING_ORANGE
@@ -180,4 +174,4 @@
/datum/id_trim/away/hauntedtradingpost/boss
assignment = "Donk Co. Executive"
access = list(ACCESS_SYNDICATE, ACCESS_AWAY_COMMAND)
big_pointer = TRUE
// //
code/datums/id_trim/syndicate.dm
-16
View File
@@ -7,14 +7,11 @@
sechud_icon_state = SECHUD_SYNDICATE
access = list(ACCESS_SYNDICATE)
threat_modifier = 5 // Bad guy on deck
big_pointer = TRUE
pointer_color = COLOR_SYNDIE_RED
/// Trim for Syndicate mobs, outfits and corpses.
/datum/id_trim/syndicom/crew
assignment = "Syndicate Operative"
access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS)
big_pointer = FALSE
/// Interdyne medical Staff
/datum/id_trim/syndicom/Interdyne/pharmacist
@@ -22,8 +19,6 @@
trim_state = "trim_medicaldoctor"
sechud_icon_state = SECHUD_SYNDICATE_INTERDYNE
access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS, ACCESS_SURGERY)
big_pointer = FALSE
pointer_color = null
/// Interdyne head medical Staff
/datum/id_trim/syndicom/Interdyne/pharmacist_director
@@ -33,8 +28,6 @@
subdepartment_color = COLOR_SYNDIE_RED_HEAD
sechud_icon_state = SECHUD_SYNDICATE_INTERDYNE_HEAD
access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS, ACCESS_SURGERY)
big_pointer = TRUE
pointer_color = COLOR_SYNDIE_RED_HEAD
/// Trim for the space IRS agents (why are they syndie access? I wouldn't worry about it.)
/datum/id_trim/syndicom/irs
@@ -44,14 +37,11 @@
subdepartment_color = COLOR_COMMAND_BLUE
sechud_icon_state = SECHUD_DEATH_COMMANDO
access = list(ACCESS_SYNDICATE, ACCESS_MAINT_TUNNELS)
big_pointer = FALSE
pointer_color = null
/datum/id_trim/syndicom/irs/auditor
assignment = "Internal Revenue Service Head Auditor"
trim_state = "trim_quartermaster"
sechud_icon_state = SECHUD_QUARTERMASTER
big_pointer = TRUE
/// Trim for Syndicate mobs, outfits and corpses.
/datum/id_trim/syndicom/captain
@@ -70,8 +60,6 @@
/datum/id_trim/battlecruiser/captain
assignment = "Syndicate Battlecruiser Captain"
access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER)
big_pointer = TRUE
pointer_color = COLOR_SYNDIE_RED
/// Trim for Chameleon ID cards. Many outfits, nuke ops and some corpses hold Chameleon ID cards.
/datum/id_trim/chameleon
@@ -91,8 +79,6 @@
/datum/id_trim/chameleon/operative/nuke_leader
assignment = "Syndicate Operative Leader"
access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER)
big_pointer = TRUE
pointer_color = COLOR_SYNDIE_RED
/// Trim for Chameleon ID cards. Many outfits, nuke ops and some corpses hold Chameleon ID cards.
/datum/id_trim/chameleon/operative/clown
@@ -103,5 +89,3 @@
/datum/id_trim/chameleon/operative/clown_leader
assignment = "Syndicate Entertainment Operative Leader"
access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER)
big_pointer = TRUE
pointer_color = COLOR_SYNDIE_RED