reverts every change slowing down developement of this PR

This commit is contained in:
Dan-Neposh
2021-01-21 23:42:23 -05:00
parent 04d5721c4d
commit 48d8ffc9a7
10 changed files with 5 additions and 40 deletions
@@ -252,7 +252,9 @@
E.eminence_help()
//Returns to the Ark - Going along with their superior mobility
/*
//Returns to the Ark - Commented out and replaced with obelisk_jump
/datum/action/innate/eminence/ark_jump
name = "Return to Ark"
desc = "Warps you to the Ark."
@@ -265,8 +267,8 @@
owner.playsound_local(owner, 'sound/magic/magic_missile.ogg', 50, TRUE)
flash_color(owner, flash_color = "#AF0AAF", flash_time = 25)
else
to_chat(owner, "<span class='nezbere '>There is no Ark to warp to, ascendant one.</span>")
to_chat(owner, "<span class='warning '>There is no Ark!</span>")
*/
//Warps to a chosen Obelisk
/datum/action/innate/eminence/obelisk_jump
@@ -7,7 +7,6 @@
antag_moodlet = /datum/mood_event/cult
skill_modifiers = list(/datum/skill_modifier/job/level/wiring, /datum/skill_modifier/job/level/dwarfy/blacksmithing)
var/datum/action/innate/hierophant/hierophant_network = new
var/datum/action/innate/eminence_ascend = new
threat = 3
var/datum/team/clockcult/clock_team
var/make_team = TRUE //This should be only false for tutorial scarabs
@@ -33,7 +32,6 @@
/datum/antagonist/clockcult/Destroy()
qdel(hierophant_network)
qdel(eminence_ascend)
return ..()
/datum/antagonist/clockcult/get_team()
@@ -138,7 +136,6 @@
hierophant_network.span_for_name = "nezbere"
hierophant_network.span_for_message = "brass"
hierophant_network.Grant(current)
eminence_ascend.Grant(current)
current.throw_alert("clockinfo", /obj/screen/alert/clockwork/infodump)
var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar
if(G && G.active && ishuman(current))
-15
View File
@@ -286,18 +286,3 @@
/obj/machinery/power/port_gen/pacman/mrs/overheat()
explosion(src.loc, 4, 4, 4, -1)
////////////////
// CLOCKWORK //
//////////////
/obj/machinery/power/port_gen/pacman/clockwork
name = "clockwork generator"
base_icon = "clockgen"
icon_state = "clockgen_0"
circuit = /obj/item/circuitboard/machine/clockwork/generator
max_sheets = 100
power_gen = 2500
sheet_path = /obj/item/stack/tile/brass
time_per_sheet = 260
/datum/looping_sound/generator/clockwork/soundloop