From 494f306fcc05d1d89631798ce9c03bec08bb5859 Mon Sep 17 00:00:00 2001
From: delingar <93310496+delingar@users.noreply.github.com>
Date: Tue, 7 May 2024 21:27:48 +0300
Subject: [PATCH] RD get robo knowledges (#82642)
## About The Pull Request
Setting RD suplex skillchip as common chip. Adding Roboticist's
skillchip into RD. Skillchip's categories are global defines now
## Why It's Good For The Game
RD is literally the most skilled scientist and roboticist. CEO of all
Silicons. Why he doesn't have robo wires trait?
---
_maps/RandomRuins/SpaceRuins/dangerous_research.dmm | 2 +-
code/__DEFINES/skills.dm | 6 ++++++
code/modules/jobs/job_types/research_director.dm | 2 +-
.../rod_suplex.dm} | 5 ++++-
.../library/skill_learning/job_skillchips/_job.dm | 5 -----
code/modules/library/skill_learning/skillchip.dm | 9 ---------
tgstation.dme | 2 +-
7 files changed, 13 insertions(+), 18 deletions(-)
rename code/modules/library/skill_learning/{job_skillchips/research_director.dm => generic_skillchips/rod_suplex.dm} (85%)
diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
index 84a3a2658d3..a7eac1fe1a8 100644
--- a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
+++ b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
@@ -1192,7 +1192,7 @@
},
/obj/effect/decal/cleanable/blood/gibs,
/obj/item/organ/internal/brain,
-/obj/item/skillchip/job/research_director,
+/obj/item/skillchip/research_director,
/obj/effect/turf_decal/tile/neutral/half{
dir = 4
},
diff --git a/code/__DEFINES/skills.dm b/code/__DEFINES/skills.dm
index f6ecde7c2e1..5a945d7ec57 100644
--- a/code/__DEFINES/skills.dm
+++ b/code/__DEFINES/skills.dm
@@ -46,3 +46,9 @@
///The base modifier a boulder's size grants to the mining skill.
#define MINING_SKILL_BOULDER_SIZE_XP 10
+
+// Skillchip categories
+//Various skillchip categories. Use these when setting which categories a skillchip restricts being paired with
+//while using the SKILLCHIP_RESTRICTED_CATEGORIES flag
+#define SKILLCHIP_CATEGORY_GENERAL "general"
+#define SKILLCHIP_CATEGORY_JOB "job"
diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm
index 1142ba033ff..bcf34c37228 100644
--- a/code/modules/jobs/job_types/research_director.dm
+++ b/code/modules/jobs/job_types/research_director.dm
@@ -76,7 +76,7 @@
messenger = /obj/item/storage/backpack/messenger/science
chameleon_extras = /obj/item/stamp/head/rd
- skillchips = list(/obj/item/skillchip/job/research_director)
+ skillchips = list(/obj/item/skillchip/research_director, /obj/item/skillchip/job/roboticist)
/datum/outfit/job/rd/mod
name = "Research Director (MODsuit)"
diff --git a/code/modules/library/skill_learning/job_skillchips/research_director.dm b/code/modules/library/skill_learning/generic_skillchips/rod_suplex.dm
similarity index 85%
rename from code/modules/library/skill_learning/job_skillchips/research_director.dm
rename to code/modules/library/skill_learning/generic_skillchips/rod_suplex.dm
index 899defb1fd5..b889073909d 100644
--- a/code/modules/library/skill_learning/job_skillchips/research_director.dm
+++ b/code/modules/library/skill_learning/generic_skillchips/rod_suplex.dm
@@ -1,4 +1,4 @@
-/obj/item/skillchip/job/research_director
+/obj/item/skillchip/research_director
name = "R.D.S.P.L.X. skillchip"
desc = "Knowledge of how to solve the ancient conumdrum; what happens when an unstoppable force meets an immovable object."
auto_traits = list(TRAIT_ROD_SUPLEX)
@@ -7,3 +7,6 @@
skill_icon = "dumbbell"
activate_message = "You realise if you apply the correct force, at the correct angle, it is possible to make the immovable permanently movable."
deactivate_message = "You forget how to permanently anchor a paradoxical object."
+ chip_category = SKILLCHIP_CATEGORY_GENERAL
+ skillchip_flags = NONE
+ slot_use = 1
diff --git a/code/modules/library/skill_learning/job_skillchips/_job.dm b/code/modules/library/skill_learning/job_skillchips/_job.dm
index 87f2d47ac9c..23381d06066 100644
--- a/code/modules/library/skill_learning/job_skillchips/_job.dm
+++ b/code/modules/library/skill_learning/job_skillchips/_job.dm
@@ -1,11 +1,6 @@
-/// Job related skillchip category
-#define SKILLCHIP_CATEGORY_JOB "job"
-
/obj/item/skillchip/job
skillchip_flags = SKILLCHIP_RESTRICTED_CATEGORIES
chip_category = SKILLCHIP_CATEGORY_JOB
incompatibility_list = list(SKILLCHIP_CATEGORY_JOB)
abstract_parent_type = /obj/item/skillchip/job
slot_use = 2
-
-#undef SKILLCHIP_CATEGORY_JOB
diff --git a/code/modules/library/skill_learning/skillchip.dm b/code/modules/library/skill_learning/skillchip.dm
index 9657a330527..ae40b84c64b 100644
--- a/code/modules/library/skill_learning/skillchip.dm
+++ b/code/modules/library/skill_learning/skillchip.dm
@@ -1,10 +1,3 @@
-// Skillchip categories
-//Various skillchip categories. Use these when setting which categories a skillchip restricts being paired with
-//while using the SKILLCHIP_RESTRICTED_CATEGORIES flag
-/// General related skillchip category
-#define SKILLCHIP_CATEGORY_GENERAL "general"
-
-
/obj/item/skillchip
name = "skillchip"
desc = "This biochip integrates with user's brain to enable mastery of specific skill. Consult certified Nanotrasen neurosurgeon before use."
@@ -531,5 +524,3 @@
ADD_TRAIT(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT)
source.adjustStaminaLoss(20)
addtimer(TRAIT_CALLBACK_REMOVE(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT), FLIP_EMOTE_DURATION + 0.1 SECONDS)
-
-#undef SKILLCHIP_CATEGORY_GENERAL
diff --git a/tgstation.dme b/tgstation.dme
index ae5655337fd..c46eb84b0e8 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -4370,13 +4370,13 @@
#include "code\modules\library\random_books.dm"
#include "code\modules\library\skill_learning\skill_station.dm"
#include "code\modules\library\skill_learning\skillchip.dm"
+#include "code\modules\library\skill_learning\generic_skillchips\rod_suplex.dm"
#include "code\modules\library\skill_learning\job_skillchips\_job.dm"
#include "code\modules\library\skill_learning\job_skillchips\chef.dm"
#include "code\modules\library\skill_learning\job_skillchips\clown.dm"
#include "code\modules\library\skill_learning\job_skillchips\janitor.dm"
#include "code\modules\library\skill_learning\job_skillchips\miner.dm"
#include "code\modules\library\skill_learning\job_skillchips\psychologist.dm"
-#include "code\modules\library\skill_learning\job_skillchips\research_director.dm"
#include "code\modules\library\skill_learning\job_skillchips\roboticist.dm"
#include "code\modules\library\skill_learning\job_skillchips\station_engineer.dm"
#include "code\modules\lighting\lighting_area.dm"