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

Merge pull request #46405 from Qustinnus/borgfix

Browse Source 
Fixes borg petting
This commit is contained in:
oranges
2019-09-09 10:23:50 +12:00
committed by GitHub
parent 7b3651625b 2ef1435af8
commit 03bf35433b
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/components.dm
+1
View File
@@ -271,6 +271,7 @@
#define COMSIG_HUMAN_MELEE_UNARMED_ATTACK "human_melee_unarmed_attack" //from mob/living/carbon/human/UnarmedAttack(): (atom/target, proximity)
#define COMSIG_HUMAN_MELEE_UNARMED_ATTACKBY "human_melee_unarmed_attackby" //from mob/living/carbon/human/UnarmedAttack(): (mob/living/carbon/human/attacker)
#define COMSIG_HUMAN_DISARM_HIT "human_disarm_hit" //Hit by successful disarm attack (mob/living/carbon/human/attacker,zone_targeted)
#define COMSIG_JOB_RECEIVED "job_received" //Whenever EquipRanked is called, called after job is set
// /datum/species signals
#define COMSIG_SPECIES_GAIN "species_gain" //from datum/species/on_species_gain(): (datum/species/new_species, datum/species/old_species)
code/controllers/subsystem/job.dm
+3
View File
@@ -412,6 +412,9 @@ SUBSYSTEM_DEF(job)
H.job = rank
SEND_SIGNAL(H, COMSIG_JOB_RECEIVED, H.job)
//If we joined at roundstart we should be positioned at our workstation
if(!joined_late)
var/obj/S = null
code/datums/components/mood.dm
+6 -5
View File
@@ -25,22 +25,23 @@
RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/on_revive)
RegisterSignal(parent, COMSIG_MOB_HUD_CREATED, .proc/modify_hud)
RegisterSignal(parent, COMSIG_JOB_RECEIVED, .proc/register_job_signals)
var/mob/living/owner = parent
if(owner.hud_used)
modify_hud()
var/datum/hud/hud = owner.hud_used
hud.show_hud(hud.hud_version)
if(!ishuman(owner))
return
var/mob/living/carbon/human/H = owner
if(H.mind?.assigned_role in list("Research Director", "Scientist", "Roboticist"))
RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT_RND, .proc/add_event) //Only for RnD members
/datum/component/mood/Destroy()
STOP_PROCESSING(SSmood, src)
unmodify_hud()
return ..()
/datum/component/mood/proc/register_job_signals(datum/source, job)
if(job in list("Research Director", "Scientist", "Roboticist"))
RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT_RND, .proc/add_event) //Mood events that are only for RnD members
/datum/component/mood/proc/print_mood(mob/user)
var/msg = "<span class='info'>*---------*\n<EM>Your current mood</EM>\n"
msg += "<span class='notice'>My mental status: </span>" //Long term