mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] Polaris Hook Removal Part 1 (#11887)
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com> Co-authored-by: C.L. <killer65311@gmail.com>
This commit is contained in:
committed by
GitHub
parent
2a35bdaac7
commit
d82d0807a5
@@ -1,5 +1,6 @@
|
||||
/obj/machinery/button/attack_hand(obj/item/W, mob/user as mob)
|
||||
if(..()) return 1
|
||||
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_BUTTON_PRESSED, src, user)
|
||||
playsound(src, 'sound/machines/button.ogg', 100, 1)
|
||||
|
||||
/obj/machinery/button/windowtint/multitint
|
||||
|
||||
@@ -131,11 +131,7 @@
|
||||
H.ckey = BR.ckey
|
||||
to_chat(H, span_warning(span_bold("Consciousness slowly creeps over you as your body regenerates.") + "<br>" + span_bold(span_large("Your recent memories are fuzzy, and it's hard to remember anything from today...")) + \
|
||||
"<br>" + span_notice(span_italics("So this is what cloning feels like?"))))
|
||||
|
||||
// -- Mode/mind specific stuff goes here
|
||||
callHook("clone", list(H))
|
||||
update_antag_icons(H.mind)
|
||||
// -- End mode specific stuff
|
||||
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_RESLEEVED_MIND, H, clonemind)
|
||||
|
||||
// A modifier is added which makes the new clone be unrobust.
|
||||
// Upgraded cloners can reduce the time of the modifier, up to 80%
|
||||
|
||||
@@ -224,7 +224,7 @@
|
||||
modify.assignment = t1
|
||||
modify.rank = t1
|
||||
|
||||
callHook("reassign_employee", list(modify))
|
||||
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_REASSIGN_EMPLOYEE_IDCARD, modify)
|
||||
. = TRUE
|
||||
|
||||
if("reg")
|
||||
@@ -280,8 +280,7 @@
|
||||
if(is_authenticated())
|
||||
modify.assignment = "Dismissed" //VOREStation Edit: setting adjustment
|
||||
modify.access = list()
|
||||
|
||||
callHook("terminate_employee", list(modify))
|
||||
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_TERMINATE_EMPLOYEE_IDCARD, modify)
|
||||
|
||||
. = TRUE
|
||||
|
||||
|
||||
@@ -194,7 +194,7 @@
|
||||
card.name = text("[card.registered_name]'s ID Card ([card.assignment])")
|
||||
GLOB.data_core.manifest_modify(card.registered_name, card.assignment, card.rank)
|
||||
card.last_job_switch = world.time
|
||||
callHook("reassign_employee", list(card))
|
||||
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_REASSIGN_EMPLOYEE_IDCARD, card)
|
||||
newjob.current_positions++
|
||||
var/mob/living/carbon/human/H = user
|
||||
H.mind.assigned_role = card.rank
|
||||
@@ -220,7 +220,7 @@
|
||||
card.name = text("[card.registered_name]'s ID Card ([card.assignment])")
|
||||
GLOB.data_core.manifest_modify(card.registered_name, card.assignment, card.rank)
|
||||
card.last_job_switch = world.time
|
||||
callHook("reassign_employee", list(card))
|
||||
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_REASSIGN_EMPLOYEE_IDCARD, card)
|
||||
var/mob/living/carbon/human/H = user
|
||||
H.mind.assigned_role = ptojob.title
|
||||
H.mind.role_alt_title = ptojob.title
|
||||
|
||||
@@ -392,14 +392,14 @@ var/list/whitelisted_positions = list(
|
||||
writer.assignment = t1
|
||||
writer.name = text("[writer.registered_name]'s ID Card ([writer.assignment])")
|
||||
data_core.manifest_modify(writer.registered_name, writer.assignment, writer.rank)
|
||||
callHook("reassign_employee", list(writer))
|
||||
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_REASSIGN_EMPLOYEE_IDCARD, writer)
|
||||
|
||||
if("reg" in href_list)
|
||||
if(auth)
|
||||
writer.registered_name = href_list["reg"]
|
||||
writer.name = text("[writer.registered_name]'s ID Card ([writer.assignment])")
|
||||
data_core.manifest_modify(writer.registered_name, writer.assignment, writer.rank)
|
||||
callHook("reassign_employee", list(writer))
|
||||
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_REASSIGN_EMPLOYEE_IDCARD, writer)
|
||||
|
||||
computer.updateUsrDialog(usr)
|
||||
return
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
GLOBAL_LIST_EMPTY(doppler_arrays)
|
||||
|
||||
/obj/machinery/doppler_array
|
||||
anchored = TRUE
|
||||
name = "tachyon-doppler array"
|
||||
@@ -11,37 +9,35 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
|
||||
|
||||
/obj/machinery/doppler_array/Initialize(mapload)
|
||||
. = ..()
|
||||
GLOB.doppler_arrays += src
|
||||
RegisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION, PROC_REF(sense_explosion))
|
||||
|
||||
/obj/machinery/doppler_array/Destroy()
|
||||
GLOB.doppler_arrays -= src
|
||||
UnregisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION)
|
||||
. = ..()
|
||||
|
||||
/obj/machinery/doppler_array/proc/sense_explosion(var/x0,var/y0,var/z0,var/devastation_range,var/heavy_impact_range,var/light_impact_range,var/took)
|
||||
if(stat & NOPOWER) return
|
||||
if(z != z0) return
|
||||
/obj/machinery/doppler_array/proc/sense_explosion(datum/source, turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, seconds_taken)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
var/dx = abs(x0-x)
|
||||
var/dy = abs(y0-y)
|
||||
var/distance
|
||||
var/direct
|
||||
if(stat & NOPOWER)
|
||||
return
|
||||
|
||||
if(dx > dy)
|
||||
distance = dx
|
||||
if(x0 > x) direct = EAST
|
||||
else direct = WEST
|
||||
else
|
||||
distance = dy
|
||||
if(y0 > y) direct = NORTH
|
||||
else direct = SOUTH
|
||||
var/x0 = epicenter.x
|
||||
var/y0 = epicenter.y
|
||||
var/z0 = epicenter.z
|
||||
if(!(z0 in GetConnectedZlevels(z)))
|
||||
return
|
||||
var/turf/our_turf = get_turf(src)
|
||||
if(our_turf.Distance(epicenter) > 100)
|
||||
return
|
||||
|
||||
if(distance > 100) return
|
||||
if(!(direct & dir)) return
|
||||
/* There is no way to rotate these... Why?
|
||||
var/direct = get_dir(our_turf,epicenter)
|
||||
if(!(direct & dir))
|
||||
return
|
||||
*/
|
||||
|
||||
var/message = "Explosive disturbance detected - Epicenter at: grid ([x0],[y0]). Epicenter radius: [devastation_range]. Outer radius: [heavy_impact_range]. Shockwave radius: [light_impact_range]. Temporal displacement of tachyons: [took]seconds."
|
||||
|
||||
for(var/mob/O in hearers(src, null))
|
||||
O.show_message(span_npc_say(span_name("[src]") + " states coldly, \"[message]\""),2)
|
||||
var/message = "Explosive disturbance detected - Epicenter at: grid ([x0],[y0],[z0]). Epicenter radius: [devastation_range]. Outer radius: [heavy_impact_range]. Shockwave radius: [light_impact_range]. Temporal displacement of tachyons: [seconds_taken] seconds."
|
||||
audible_message(span_npc_say(span_name("[src]") + " states coldly, \"[message]\""))
|
||||
|
||||
/obj/machinery/doppler_array/power_change()
|
||||
..()
|
||||
|
||||
@@ -70,6 +70,7 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
|
||||
M.ooc_notes_favs = ooc_notes_favs
|
||||
M.ooc_notes_maybes = ooc_notes_maybes
|
||||
M.ooc_notes_style = ooc_notes_style
|
||||
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_RESLEEVED_MIND, M, stored_mind)
|
||||
clear_mind()
|
||||
|
||||
|
||||
|
||||
@@ -221,7 +221,7 @@
|
||||
cell_component.installed = 1
|
||||
|
||||
feedback_inc("cyborg_birth",1)
|
||||
callHook("borgify", list(O))
|
||||
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_BORGIFY, O)
|
||||
|
||||
qdel(src)
|
||||
else
|
||||
|
||||
@@ -137,12 +137,3 @@ var/list/multi_point_spawns
|
||||
|
||||
/obj/random_multi/single_item/generate_items()
|
||||
new item_path(loc)
|
||||
|
||||
/hook/roundstart/proc/generate_multi_spawn_items()
|
||||
for(var/id in multi_point_spawns)
|
||||
var/list/spawn_points = multi_point_spawns[id]
|
||||
var/obj/random_multi/rm = pickweight(spawn_points)
|
||||
rm.generate_items()
|
||||
for(var/entry in spawn_points)
|
||||
qdel(entry)
|
||||
return 1
|
||||
|
||||
@@ -394,13 +394,6 @@ var/list/species_sound_map = list(
|
||||
"Unset" = use_default
|
||||
)
|
||||
|
||||
/* // Not sure we even really need this
|
||||
/hook/startup/proc/Init_species_sounds() // The entries we're checking over MUST have unique keys.
|
||||
for(var/i in species_sound_map)
|
||||
species_sounds |= species_sound_map[i]
|
||||
return 1
|
||||
*/
|
||||
|
||||
/*
|
||||
* Call this for when you need a sound from an already-identified list - IE, "Canine". pick() cannot parse procs.
|
||||
* Indexes must be pre-calculated by the time it reaches here - for instance;
|
||||
|
||||
Reference in New Issue
Block a user