cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 00:58:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] RD get robo knowledges (#27631)

Browse Source 
* 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?

* RD get robo knowledges

---------

Co-authored-by: delingar <93310496+delingar@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-05-08 21:01:06 +02:00
committed by GitHub
co-authored by delingar
parent 5edf56e00f
commit 6facfb1d90
7 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
+1 -1
View File
@@ -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
},
code/__DEFINES/skills.dm
+6
View File
@@ -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"
code/modules/jobs/job_types/research_director.dm
+1 -1
View File
@@ -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)"
code/modules/library/skill_learning/job_skillchips/research_director.dm → code/modules/library/skill_learning/generic_skillchips/rod_suplex.dm
+4 -1
View File
@@ -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 = "<span class='notice'>You realise if you apply the correct force, at the correct angle, it is possible to make the immovable permanently movable.</span>"
deactivate_message = "<span class='notice'>You forget how to permanently anchor a paradoxical object.</span>"
chip_category = SKILLCHIP_CATEGORY_GENERAL
skillchip_flags = NONE
slot_use = 1
code/modules/library/skill_learning/job_skillchips/_job.dm
-5
View File
@@ -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
code/modules/library/skill_learning/skillchip.dm
-9
View File
@@ -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
tgstation.dme
+1 -1
View File
@@ -4467,13 +4467,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"