From 335e123643dbae119fecbe9786ebe3ea15e3557d Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Mon, 22 Aug 2016 03:18:42 -0400 Subject: [PATCH] ever feel like you forgot something? --- code/game/gamemodes/cult/cult_datums.dm | 3 +++ code/game/gamemodes/cult/cult_items.dm | 19 +++++++++++++++++-- code/game/turfs/simulated/floor/plating.dm | 3 ++- code/game/turfs/simulated/walls_misc.dm | 8 +++++--- code/modules/power/singularity/narsie.dm | 2 +- icons/turf/walls/cult_wall.dmi | Bin 1682 -> 6204 bytes 6 files changed, 28 insertions(+), 7 deletions(-) diff --git a/code/game/gamemodes/cult/cult_datums.dm b/code/game/gamemodes/cult/cult_datums.dm index 6122ce2c01f..34ff3efe978 100644 --- a/code/game/gamemodes/cult/cult_datums.dm +++ b/code/game/gamemodes/cult/cult_datums.dm @@ -89,6 +89,9 @@ entity_title2 = "The One Who Beckons" entity_title3 = "The Ferryman of Oblivion" + cult_wall_icon_state = "deathcult" + cult_floor_icon_state = "carpet-broken" + artificer_name = "Boneshaper" behemoth_name = "Draugr" diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index ecbea9b23fd..e0f3afeed69 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -290,12 +290,27 @@ to_chat(user, "\The [src] flickers out of your hands, too eager to move!") return + var/outer_tele_radius = 0 + var/inner_tele_radius = 9 + var/mob/living/carbon/C = user var/turf/mobloc = get_turf(C) - var/turf/destination = get_teleport_loc(mobloc,C,9,1,3,1,0,1) + var/list/turfs = new/list() + for(var/turf/T in range(user, outer_tele_radius)) + if(T in range(user, inner_tele_radius)) + continue + if(istype(T, /turf/space)) + continue + if(T.x > world.maxx-outer_tele_radius || T.x < outer_tele_radius) + continue //putting them at the edge is dumb + if(T.y > world.maxy-outer_tele_radius || T.y < outer_tele_radius) + continue - if(destination) + turfs += T + + if(turfs.len) uses-- + var/turf/destination = pick(turfs) if(uses <= 0) icon_state ="shifter_drained" playsound(mobloc, "sparks", 50, 1) diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 8292206402b..58bcfe118fa 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -135,7 +135,8 @@ /turf/simulated/floor/engine/cult/New() ..() - icon_state = ticker.mode.cultdat.cult_floor_icon_state + if(ticker.mode)//only do this if the round is going..otherwise..fucking asteroid.. + icon_state = ticker.mode.cultdat.cult_floor_icon_state /turf/simulated/floor/engine/cult/narsie_act() return diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm index a2eb6581172..9aca6f4918e 100644 --- a/code/game/turfs/simulated/walls_misc.dm +++ b/code/game/turfs/simulated/walls_misc.dm @@ -5,12 +5,14 @@ icon_state = "cult" walltype = "cult" canSmoothWith = null + smooth = SMOOTH_FALSE /turf/simulated/wall/cult/New() - new /obj/effect/overlay/temp/cult/turf(src) - icon_state = ticker.mode.cultdat.cult_wall_icon_state - walltype = ticker.mode.cultdat.cult_wall_icon_state ..() + if(ticker.mode)//game hasn't started offically don't do shit.. + new /obj/effect/overlay/temp/cult/turf(src) + icon_state = ticker.mode.cultdat.cult_wall_icon_state + walltype = ticker.mode.cultdat.cult_wall_icon_state /turf/simulated/wall/cult/artificer name = "runed stone wall" diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index 795e94f1d61..ee8f6d96c67 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -26,7 +26,7 @@ ..() icon_state = ticker.mode.cultdat.entity_icon_state name = ticker.mode.cultdat.entity_name - to_chat(world, "NAR-SIE HAS RISEN") + to_chat(world, " [name] HAS RISEN") world << pick(sound('sound/hallucinations/im_here1.ogg'), sound('sound/hallucinations/im_here2.ogg')) var/area/A = get_area(src) diff --git a/icons/turf/walls/cult_wall.dmi b/icons/turf/walls/cult_wall.dmi index 3ab86f21370509ba6a2c1606741915dac2ea5c4f..052b3f4f8cdd3a1505d0e3533487907fbcf611d4 100644 GIT binary patch literal 6204 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 Yvf9~?VuwCl{~rKAH1yT09@&Qe9~M3VI{*Lx literal 1682 zcmZ`)X*Ao37SELUrzR24QmK$yYETtalum<0#L$BTnKrbRwv14cSjIGJH)2d%X&qbb zq+*%Y+DWUWQfZ@9%IHEhs)mR$wR;TF^re00yl?Nry}#xB?mhS0%_IAM2UFKq2Z2B^ zFHd)WCDwc{RTX7tO(&z2U`_U>5CsB(rHP3*fq=ze%=Gl^tgP@5h|-LPLcdp6_k=*K z!Qe*#Fb;uin(2>4JfBkzewFC&8vw%1jsKt&9my1GqI*Qb`S>ViVibc80$r@Q`l4N3 zXrw7x4Xk!6c;nB#P*OlXf?3wozwLHG&?)}=l>R)mcTpqFAYJuz911;iaOdx*Q%C)% zT&KMWPVxL4GkM2+zCA-YDNC)zMxGXV42&@OKf6Z+RCHln7hOJi0|*#G1z~1765tr5 zrEDkYI1V^@;U_4wp&PEHbKS(P01_3C^Pi*%5CTaE=L`{jP!8vxE8STx*#T{^W_ln8 zIfp?Y@b_NscnU3ZvCNe|$v;4g3q3+XKWQ{gl zVg}|d($cf|vbDu4%csX@VNdox+3xTE&KR=CSrBq|XxVgXsC=5?kTAn~2UF}axsPMF zfZv0!UV@x-5!5lL=pJeOHaBUy<0HYA4ncubWw6*ry(BS7RamQVSpnI*bi@xdPWA5IHaeDM)q+URN3J^m3|C1&45L*865Ttq-LdyYXsdBbIOrK6rjj zqd%X9fUB8h>b@iNXaaOF=VoDU@*kQ=C=m$~+n$6HR&6J=MJCz>wIhHGX5mn8Fk@N( z&E4S}V|d<BYo)wltKhZ?n^N8vrC8txTa_?$lbI;ytxDreAY$Uw2N$d&G z>~Al|BYrhO^w#bx9bK1&RtBlPM|157Ch)9sb9vGs_zu15Ludm9bwz@G^NEo$n0>w6{1V~6egJRH=pJh= zrZCUOkj!E>F2g=%h_b_`2YjcHqH%7xFvn6FM)Q>7nd`G%#;~-MA|Q9C(@$dt3?4T5 z8lJS1^NrJL*v+c(12b%D6_~>gaW`S|e|9F=1RlpoEdhv_-7uy|m zQ|$)OWOoBFb%f{dYvFB8Vx7tgcz{wR-Tw?)P+jMHtZQM7^N+;YI>K6%1nX&Mu#l<@ za5|bfO4Udp9_ad#P?}o)CpX^D;ZGQ9{5v6Zwk!=DO&c>?S_ZVUrZstUbl@$Mv5{p3 z_qFR@3)4G=stCU*#Yg?aSgo-h$I@POvPO83>oq>ZbNKQqarRN?av(POD12fg26gAJ zH~%NFNI{qgb#%u(;z)ZMREID=j1`%*MQ)p@%u* z{Q#eGgFarAxf{f)tUo@KIHow^Xdu*v4}O&X$R};dZ5~X@ozvd$=VL9lN^*>UDB~@! z8Xse??bb*_AHJ;*bv(dy=QG}nC2sZEKhAMmvf)l22+Z-*DX;z<3hPfdk&64f2cC5+ zitXfW!J|^e+P8A&-|`~@r(4AgtZ;L;RubwV4E=SNEc2=CwS$q&RUWLfX;ca^a9_l` z!WdzjPnW$U{W*vA3e&%PycJIRd`TQHCAy3!Lf=xH6BjP+o&}COm2?iz=NuaoS0hDd zie+#qOZXsobHbqcezOKx|6v>S$+jD-N)zU4_)NtmJRn_$7+lYZwCp`MKq=kGEb5Su zisk)I7Ohl=I$CM=Xr)b|Y;Su^h}8$Tie%l+7~gL5VeNBg9a+H!3v=YT?mm~*5DBRV zP7E<@=l{m=COBC`BQF#3NYqyj32{!VRT5WvN$Z~K_LeE?vyv~%8^A~VbHmYX@vebO z2ky3JaO^|A`of3PyaqmoccrIfj?LGHZj^ZZi}jFPWiI)}+b(kGo;bB*x;}1+;aZ