Skip to content

Commit

Permalink
Loadsatweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
Xhuis committed May 16, 2016
1 parent 9a3fd86 commit 9479e28
Show file tree
Hide file tree
Showing 15 changed files with 200 additions and 75 deletions.
3 changes: 0 additions & 3 deletions code/game/atoms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,6 @@ var/list/blood_splatter_icons = list()
/atom/proc/narsie_act()
return

/atom/proc/ratvar_act()
return

/atom/proc/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user)
return 0

Expand Down
9 changes: 8 additions & 1 deletion code/game/gamemodes/clock_cult/clock_mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "anima fragment"
desc = "An ominous humanoid shell with a single glowing yellow eye, pushed into the air by jets of blazing yellow fire."
icon = 'icons/mob/clockwork_mobs.dmi'
icon_state = "anima_fragment"
icon_state = "anime_fragment"
health = 75 //Glass cannon
maxHealth = 75
wander = FALSE
Expand All @@ -17,6 +17,13 @@
in addition to being immune to extreme temperatures and pressures. Your goal is to serve the Justiciar and his servants in any way you can. You yourself are one of these servants, and will \
be able to utilize anything they can, assuming it doesn't require opposable thumbs.</b>"

/mob/living/simple_animal/hostile/anima_fragment/New()
..()
if(prob(1))
name = "anime fragment"
real_name = name
desc = "I-it's not like I want to show you the light of the Justiciar or anything, B-BAKA!"

/mob/living/simple_animal/hostile/anima_fragment/death(gibbed)
..(TRUE)
visible_message("<span class='warning'>[src]'s flame jets cut out as it falls to the floor with a tremendous crash. A cube of metal tumbles out, whirring and sputtering.</span>", \
Expand Down
149 changes: 119 additions & 30 deletions code/game/gamemodes/clock_cult/clock_objects.dm

Large diffs are not rendered by default.

52 changes: 46 additions & 6 deletions code/game/gamemodes/clock_cult/clock_ratvar.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
icon_state = "clockwork_gateway_charging"
pixel_x = -30
pixel_y = -30
health = 1000
max_health = 1000
var/progress_in_seconds = 0 //Once this reaches 300, it's game over
var/purpose_fulfilled = FALSE
var/first_sound_played = FALSE
Expand All @@ -35,10 +37,26 @@
world << sound(null, 0, channel = 8)
..()

/obj/structure/clockwork/massive/celestial_gateway/destroyed()
visible_message("<span class='userdanger'>The [src] begins to pulse uncontrollably... you might want to run!</span>")
world << sound('sound/effects/clockcult_gateway_disrupted.ogg', 0, channel = 8, volume = 50)
icon_state = "clockwork_gateway_disrupted"
takes_damage = FALSE
sleep(27)
animate(src, transform = matrix() * 2, time = 2)
explosion(src, 1, 3, 8, 8)
qdel(src)
return 1

/obj/structure/clockwork/massive/celestial_gateway/ex_act(severity)
return 0 //Nice try, Toxins!

/obj/structure/clockwork/massive/celestial_gateway/process()
if(prob(5))
for(var/mob/M in mob_list)
M << "<span class='warning'><b>You hear otherworldly sounds from the [dir2text(get_dir(get_turf(M), get_turf(src)))]...</span>"
if(!health)
return 0
progress_in_seconds++
switch(progress_in_seconds)
if(-INFINITY to 100)
Expand All @@ -58,8 +76,9 @@
icon_state = "clockwork_gateway_closing"
if(300 to INFINITY)
if(!purpose_fulfilled)
takes_damage = FALSE
purpose_fulfilled = TRUE
animate(src, transform = matrix()*1.5, time = 136)
animate(src, transform = matrix() * 1.5, time = 136)
world << sound('sound/effects/ratvar_rises.ogg', 0, channel = 8) //End the sounds
sleep(136)
new/obj/structure/clockwork/massive/ratvar(get_turf(src))
Expand Down Expand Up @@ -89,20 +108,20 @@
user << "<span class='warning'><b>Something is coming through!</b></span>"

/obj/structure/clockwork/massive/ratvar
name = "Ratvar"
name = "Ratvar, the Clockwork Justiciar"
desc = "<span class='userdanger'>What is what is what are what real what is all a lie all a lie it's all a lie why how can what is</span>"
clockwork_desc = "<span class='large_brass'><b><i>Ratvar, the Clockwork Justiciar, your master eternal.</i></b></span>"
icon = 'icons/effects/400x400.dmi'
icon = 'icons/effects/512x512.dmi'
icon_state = "ratvar"
pixel_x = -175
pixel_y = -175
pixel_x = -248
pixel_y = -248
takes_damage = FALSE
var/mob/living/prey //Whoever Ratvar is chasing
var/clashing = FALSE //If Ratvar is FUCKING FIGHTING WITH NAR-SIE

/obj/structure/clockwork/massive/ratvar/New()
..()
SSobj.processing += src
flick("ratvar_spawn_anim", src)
world << "<span class='heavy_brass'><font size=15>\"I AM FREE!\"</font></span>"
ratvar_awakens = TRUE
spawn(50)
Expand Down Expand Up @@ -200,3 +219,24 @@
narsie.clashing = FALSE
qdel(src)
return 1

/atom/proc/ratvar_act() //Called on everything near Ratvar
return

/turf/closed/wall/ratvar_act() //Walls and floors are changed to their clockwork variants
if(prob(20))
ChangeTurf(/turf/closed/wall/clockwork)
/turf/open/floor/ratvar_act()
if(prob(20))
ChangeTurf(/turf/open/floor/clockwork)

/obj/structure/window/ratvar_act() //Windows turn yellow
color = rgb(75, 53, 0)

/mob/living/ratvar_act()
add_servant_of_ratvar(src)

/mob/dead/observer/ratvar_act() //Ghosts flash yellow for a second
var/old_color = color
color = rgb(75, 53, 0) //A nice brassy yellow
animate(src, color = old_color, time = 10)
43 changes: 23 additions & 20 deletions code/game/gamemodes/clock_cult/clock_scripture.dm
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ Judgement: 10 servants, 100 CV, and any existing AIs are converted or destroyed
invocations = list("Z`rgny, orpbzr terngre!")
channel_time = 0
required_components = list("replicant_alloy" = 1)
consumed_components = list("replicant_alloy" = 1) //People were spamming slabs to get infinite components. You chose this.
whispered = TRUE
tier = SCRIPTURE_DRIVER

Expand All @@ -360,25 +361,6 @@ Judgement: 10 servants, 100 CV, and any existing AIs are converted or destroyed



/datum/clockwork_scripture/hierophant //Hierophant: Allows discreet communication between all other servants.
name = "Hierophant"
desc = "Sends a one-way message to all other servants."
invocations = list() //Spoken during the actual transmission
channel_time = 0
required_components = list("hierophant_ansible" = 1)
whispered = TRUE
tier = SCRIPTURE_DRIVER

/datum/clockwork_scripture/hierophant/scripture_effects()
var/message = stripped_input(invoker, "Enter a message to send to your fellow servants.", "Hierophant")
if(!message || !invoker || !invoker.canUseTopic(slab))
return 0
invoker.whisper("Freinagf, urne zl jbeqf. [message]")
send_hierophant_message(invoker, message)
return 1



/datum/clockwork_scripture/create_object/wraith_spectacles //Wraith Spectacles: Creates a pair of wraith spectacles.
name = "Wraith Spectacles"
desc = "Fabricates a pair of glasses that provides true sight but quickly damage vision. Nar-Sian pigs will be immediately blinded."
Expand Down Expand Up @@ -510,7 +492,7 @@ Judgement: 10 servants, 100 CV, and any existing AIs are converted or destroyed

/datum/clockwork_scripture/function_call //Function Call: Grants the invoker the ability to call forth a Ratvarian spear that deals significant damage to silicons.
name = "Function Call"
desc = "Grants the invoker the ability to call forth a Ratvarian spear that will deal significant damage to Nar-Sie's scum and silicon lifeforms. \
desc = "Grants the invoker the ability to call forth a powerful Ratvarian spear that will deal significant damage to Nar-Sie's scum and silicon lifeforms. \
It will vanish several minutes after being called."
invocations = list("Tenag zr...", "...gur zvtug-bs oenff!")
channel_time = 20
Expand Down Expand Up @@ -600,6 +582,27 @@ Judgement: 10 servants, 100 CV, and any existing AIs are converted or destroyed
creator_message = "<span class='brass'>You form a soul vessel, which immediately begins drawing in the damned.</span>"
tier = SCRIPTURE_SCRIPT



/datum/clockwork_scripture/break_will //Break Will: Deals minor brain damage and destroys the loyalty implants of nearby humans
name = "Break Will"
desc = "Deals minor brain damage and disables loyalty implants of everyone adjacent to the invoker."
invocations = list("Lbh ner jrnx.", "Lbh ner nyernql qrnq.", "Gurl jba'g fnir lbh.")
channel_time = 90
required_components = list("belligerent_eye" = 1, "guvax_capacitor" = 1)
tier = SCRIPTURE_SCRIPT

/datum/clockwork_scripture/scripture_effects()
for(var/mob/living/carbon/human/H in range(1, invoker))
if(is_servant_of_ratvar(H) && !isloyal(H))
continue
H.visible_message("<span class='warning'>[H] visibly trembles!</span>", \
"<span class='userdanger'>The words invoke a horrible fear deep in your being. Your loyalty to Nanotrasen falls away as you see how weak they truly are.</span>")
H.adjustBrainLoss(5)
for(var/obj/item/weapon/implant/loyalty/L in H)
if(L.implanted)
qdel(L)

//////////////////
// APPLICATIONS //
//////////////////
Expand Down
4 changes: 2 additions & 2 deletions code/game/gamemodes/clock_cult/clock_unsorted.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
..()

/turf/closed/wall/clockwork/process()
for(var/obj/structure/clockwork/cache/C in range(3, src))
for(var/obj/structure/clockwork/cache/C in range(1, src))
if(prob(5))
clockwork_component_cache[pick("belligerent_eye", "vanguard_cogwheel", "guvax_capacitor", "replicant_alloy", "hierophant_ansible")]++

Expand Down Expand Up @@ -52,7 +52,7 @@
..()

/turf/open/floor/clockwork/process()
for(var/mob/living/L in range(3, src))
for(var/mob/living/L in src)
if(L.stat == DEAD)
continue
L.adjustBruteLoss(-1)
Expand Down
4 changes: 0 additions & 4 deletions code/game/turfs/simulated/floor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,6 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
if(prob(20))
ChangeTurf(/turf/open/floor/engine/cult)

/turf/open/floor/ratvar_act()
if(prob(20))
ChangeTurf(/turf/open/floor/clockwork)

/turf/open/floor/can_have_cabling()
return !burnt && !broken

Expand Down
4 changes: 0 additions & 4 deletions code/game/turfs/simulated/walls.dm
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,5 @@
if(prob(20))
ChangeTurf(/turf/closed/wall/cult)

/turf/closed/wall/ratvar_act()
if(prob(20))
ChangeTurf(/turf/closed/wall/clockwork)

/turf/closed/wall/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user)
return 0
5 changes: 0 additions & 5 deletions code/modules/mob/dead/observer/observer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,6 @@ var/list/image/ghost_images_simple = list() //this is a list of all ghost images
updateallghostimages()
return ..()

/mob/dead/observer/ratvar_act()
var/old_color = color
color = rgb(75, 53, 0) //A nice brassy yellow
animate(src, color = old_color, time = 10)

/mob/dead/CanPass(atom/movable/mover, turf/target, height=0)
return 1

Expand Down
2 changes: 2 additions & 0 deletions code/modules/mob/living/carbon/brain/MMI.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@
living_mob_list += brainmob

brainmob.reset_perspective()
if(clockwork)
add_servant_of_ratvar(brainmob, TRUE)
newbrain.loc = src //P-put your brain in it
brain = newbrain

Expand Down
Binary file added icons/effects/512x512.dmi
Binary file not shown.
Binary file modified icons/effects/96x96.dmi
Binary file not shown.
Binary file modified icons/mob/clockwork_mobs.dmi
Binary file not shown.
Binary file modified icons/obj/clockwork_objects.dmi
Binary file not shown.
Binary file added sound/effects/clockcult_gateway_disrupted.ogg
Binary file not shown.

0 comments on commit 9479e28

Please sign in to comment.