Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

(tested) Re-adds re-adding EMHs #10

Merged
merged 13 commits into from
Jan 30, 2019
Merged

Conversation

Kmc2000
Copy link
Member

@Kmc2000 Kmc2000 commented Jan 19, 2019

🆑 Kmc2000
add: Added EMHs as a ghostrole. Call one in if you injure yourself and need a doctor.
/:cl:

@Kmc2000 Kmc2000 requested a review from Jalleo January 20, 2019 23:14
… EMHs_are_back

# Conflicts:
#	_maps/map_files/DeepSpace13/DS13-D1.dmm
#	_maps/map_files/DeepSpace13/DS13-D2.dmm
#	_maps/map_files/DeepSpace13/DS13-D3.dmm
Jalleo
Jalleo previously requested changes Jan 22, 2019
Copy link
Collaborator

@Jalleo Jalleo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See what I said below.

to_chat(user, "Attempting to activate EMH ((This requires a ghost willing to control it...))")
activate(null) //No EMH present, try to make one!

/obj/machinery/emh_emitter/process()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change it so the START_PROCESS and STOP_PROCESS are called to begin and stop when a EMH moves into this emitter or moves out(leaves to go to another emitter) [Literally one proc can do both of that with use of a single var or something to control it].

DS13/code/modules/EMH/EMH.dm Outdated Show resolved Hide resolved
DS13/code/modules/EMH/EMH.dm Show resolved Hide resolved
Copy link
Collaborator

@spookydonut spookydonut left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please let me know if you need help with early returns

DS13/code/modules/EMH/EMH.dm Outdated Show resolved Hide resolved
DS13/code/modules/EMH/EMH.dm Outdated Show resolved Hide resolved
DS13/code/modules/EMH/EMH.dm Outdated Show resolved Hide resolved
DS13/code/modules/EMH/EMH.dm Outdated Show resolved Hide resolved
DS13/code/modules/EMH/EMH.dm Outdated Show resolved Hide resolved
var/obj/item/card/id/ID = I
if(!istype(ID))
return
if(check_access(ID))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if(check_access(ID))
if(!check_access(ID))
return

return
if(check_access(ID))
var/question = alert("Terminate the current EMH? (this kills the current EMH)",name,"yes","no")
if(question == "no" || !question)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if(question == "no" || !question)
if(question != "yes")

DS13/code/modules/EMH/EMH.dm Outdated Show resolved Hide resolved
DS13/code/modules/EMH/EMH.dm Outdated Show resolved Hide resolved
DS13/code/modules/EMH/EMH.dm Outdated Show resolved Hide resolved
item_flags = NODROP

/obj/item/card/id/silver/emh/Initialize()
var/datum/job/captain/J = new/datum/job/captain
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make a job for the emh

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed it would be better to maintain that way.

… EMHs_are_back

# Conflicts:
#	DS13/icons/obj/decor/wall_decor.dmi
#	DeepSpace13.dme
#	_maps/map_files/DeepSpace13/DS13-D1.dmm
#	_maps/map_files/DeepSpace13/DS13-D2.dmm
#	_maps/map_files/DeepSpace13/DS13-D3.dmm
@Kmc2000 Kmc2000 dismissed stale reviews from spookydonut and Jalleo January 30, 2019 09:49

addressed

Copy link
Collaborator

@Jalleo Jalleo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost there. The processing changes are very adequate.

item_flags = NODROP

/obj/item/card/id/silver/emh/Initialize()
var/datum/job/captain/J = new/datum/job/captain
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed it would be better to maintain that way.

@@ -16,6 +16,7 @@
#define ROLE_REV_HEAD "Head Revolutionary"
#define ROLE_ALIEN "Xenomorph"
#define ROLE_PAI "pAI"
#define ROLE_EMH "Emergency Medical Hologram" //DeepSpace 13 - EMH
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably should try and work out a system so our roles are separated out into another tab from the TG roles. Primarily so its quicker to phase out. (Out of scope from this PR just resolve this comment after reading it)

new /obj/effect/temp_visual/dir_setting/ninja/cloak(get_turf(C), C.dir)
var/datum/browser/popup = new(C, "EMH rules", "EMH rules") // Pop up the rules so they can't be ignored
var/s = "<h1> -=ALL PAST LIVES ARE FORGOTTEN=- </h1> <br>\
<h2> You are an emergency medical hologram! </h2>\
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See the setup with AI laws and how it can be set config wise. We should use that to have this info below.

emh = null
closest.icon_state = "emh-on"
icon_state = "emh-off"
START_PROCESSING(SSfastprocess, closest)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stop processing the src here as well

/obj/machinery/emh_emitter/Destroy()
if(emh)
var/obj/machinery/emh_emitter/saveme = locate(/obj/machinery/emh_emitter) in GLOB.machines
if(saveme)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How will you confirm that the saveme ISNT this one or another that is about to be destroyed?

req_access = list(ACCESS_HEADS)
var/locked = FALSE //Cooldown to prevent spam

/obj/machinery/emh_emitter/Initialize()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now create a Global list specifically for the emh emitters (Or use the camera network if we are not using the SS13 camera objects/create a subsection of the camera network global for the EMH network)
Along with working out how to use the world camera_sort proc for the list.
The reason for using that proc is to make it so each emitter has a number after it so you know which one it is in that area. The second aspect is that it sorts the list into each area so its easier to navigate.

Copy link
Collaborator

@Jalleo Jalleo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SCREEEEEEEEEEEEEEEE. KMC fucked up and we cant test borgs due to flipping bad setup locally. SCREEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE

@Jalleo Jalleo merged commit 0104ccf into DDMers:master Jan 30, 2019
@Kmc2000 Kmc2000 deleted the EMHs_are_back branch January 30, 2019 16:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants