shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

July 5th TG sync (#1883)

Browse Source 
July 5th TG sync
This commit is contained in:
Poojawa
2017-07-05 22:14:19 -05:00
committed by GitHub
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/flufftext/Dreaming.dm
+8 -8
View File
@@ -1,6 +1,6 @@
/mob/living/carbon/proc/dream()
set waitfor = 0
dreaming = 1
dreaming = TRUE
var/list/dreams = list(
"an ID card","a bottle","a familiar face","a crewmember","a toolbox","a security officer","the captain",
"voices from all around","deep space","a doctor","the engine","a traitor","an ally","darkness",
@@ -9,18 +9,18 @@
"a blue light","an abandoned laboratory","Nanotrasen","The Syndicate","blood","healing","power","respect",
"riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying"
)
for(var/i = rand(1,4),i > 0, i--)
for(var/i in 1 to rand(1, rand(3, 7)))
var/dream_image = pick(dreams)
dreams -= dream_image
to_chat(src, "<span class='notice'><i>... [dream_image] ...</i></span>")
sleep(rand(40,70))
if(paralysis <= 0)
dreaming = 0
return 0
dreaming = 0
if(stat != UNCONSCIOUS || InCritical())
break
dreaming = FALSE
return 1
/mob/living/carbon/proc/handle_dreams()
if(prob(5) && !dreaming) dream()
if(prob(5) && !dreaming)
dream()
/mob/living/carbon/var/dreaming = 0
/mob/living/carbon/var/dreaming = FALSE
code/modules/flufftext/Hallucination.dm
+29 -65
View File
@@ -32,7 +32,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
//Something's wrong here
var/list/medium = list("fake_alert"=15,"items"=10,"items_other"=10,"dangerflash"=10,"bolts"=5,"flood"=5,"husks"=10,"battle"=15,"self_delusion"=10)
//AAAAH
var/list/major = list("fake"=20,"death"=10,"xeno"=10,"singulo"=10,"borer"=10,"delusion"=20,"koolaid"=10)
var/list/major = list("fake"=20,"death"=10,"xeno"=10,"singulo"=10,"delusion"=20,"koolaid"=10)
handling_hal = 1
while(hallucination > 20)
@@ -179,7 +179,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
/obj/effect/hallucination/simple/xeno/throw_impact(A)
update_icon("alienh_pounce")
if(A == target && target.stat!=DEAD)
target.Weaken(5)
target.Knockdown(100)
target.visible_message("<span class='danger'>[target] flails around wildly.</span>","<span class ='userdanger'>[name] pounces on you!</span>")
/obj/effect/hallucination/xeno_attack
@@ -222,39 +222,6 @@ Gunshots/explosions/opening doors/less rare audio (done)
/obj/effect/hallucination/simple/clown/scary
image_state = "scary_clown"
/obj/effect/hallucination/simple/borer
image_icon = 'icons/mob/animal.dmi'
image_state = "brainslug"
/obj/effect/hallucination/borer
//A borer paralyzes you and crawls in your ear
var/obj/machinery/atmospherics/components/unary/vent_pump/pump = null
var/obj/effect/hallucination/simple/borer/borer = null
/obj/effect/hallucination/borer/Initialize(mapload, var/mob/living/carbon/T)
..()
target = T
for(var/obj/machinery/atmospherics/components/unary/vent_pump/U in orange(7,target))
if(!U.welded)
pump = U
break
if(pump)
borer = new(pump.loc,target)
for(var/i=0, i<11, i++)
walk_to(borer, get_step(borer, get_cardinal_dir(borer, T)))
if(borer.Adjacent(T))
to_chat(T, "<span class='userdanger'>You feel a creeping, horrible sense of dread come over you, freezing your limbs and setting your heart racing.</span>")
T.Stun(4)
sleep(50)
qdel(borer)
sleep(rand(60, 90))
to_chat(T, "<span class='changeling'><i>Primary [rand(1000,9999)] states:</i> [pick("Hello","Hi","You're my slave now!","Don't try to get rid of me...")]</span>")
break
sleep(4)
if(!QDELETED(borer))
qdel(borer)
qdel(src)
/obj/effect/hallucination/simple/bubblegum
name = "Bubblegum"
image_icon = 'icons/mob/lavaland/96x96megafauna.dmi'
@@ -297,7 +264,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
shake_camera(target, 2, 1)
if(bubblegum.Adjacent(target) && !charged)
charged = TRUE
target.Weaken(4)
target.Knockdown(80)
target.adjustStaminaLoss(40)
step_away(target, bubblegum)
shake_camera(target, 4, 3)
@@ -348,7 +315,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
var/target_dist = get_dist(src,target)
if(target_dist<=3) //"Eaten"
target.hal_screwyhud = SCREWYHUD_CRIT
target.SetSleeping(8, no_alert = TRUE)
target.SetUnconscious(160)
addtimer(CALLBACK(parent, .proc/wake_and_restore), rand(30, 50))
/obj/effect/hallucination/battle
@@ -360,7 +327,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
switch(rand(1,5))
if(1) //Laser fight
for(var/i=0,i<hits,i++)
target.playsound_local(null, 'sound/weapons/Laser.ogg', 25, 1)
target.playsound_local(null, 'sound/weapons/laser.ogg', 25, 1)
if(prob(75))
addtimer(CALLBACK(target, /mob/.proc/playsound_local, null, 'sound/weapons/sear.ogg', 25, 1), rand(10,20))
else
@@ -384,7 +351,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
sleep(rand(CLICK_CD_RANGE, CLICK_CD_RANGE + 8))
target.playsound_local(null, get_sfx("bodyfall"), 25, 1)
if(4) //Stunprod + cablecuff
target.playsound_local(null, 'sound/weapons/Egloves.ogg', 40, 1)
target.playsound_local(null, 'sound/weapons/egloves.ogg', 40, 1)
target.playsound_local(null, get_sfx("bodyfall"), 25, 1)
sleep(20)
target.playsound_local(null, 'sound/weapons/cablecuff.ogg', 15, 1)
@@ -508,7 +475,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
A.override = 1
if(target.client)
to_chat(target, "<span class='italics'>...wabbajack...wabbajack...</span>")
target.playsound_local(target,'sound/magic/Staff_Change.ogg', 50, 1, -1)
target.playsound_local(target,'sound/magic/staff_change.ogg', 50, 1, -1)
delusion = A
target.client.images |= A
QDEL_IN(src, duration)
@@ -631,7 +598,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
else if(src.dir == WEST)
del src.currentimage
src.currentimage = new /image(left,src)
to_chat(my_target, currentimage)
SEND_IMAGE(my_target, currentimage)
/obj/effect/fake_attacker/proc/attack_loop()
@@ -675,7 +642,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
var/obj/effect/overlay/O = new/obj/effect/overlay(target.loc)
O.name = "blood"
var/image/I = image('icons/effects/blood.dmi',O,"floor[rand(1,7)]",O.dir,1)
to_chat(target, I)
SEND_IMAGE(target, I)
QDEL_IN(O, 300)
@@ -695,13 +662,13 @@ Gunshots/explosions/opening doors/less rare audio (done)
doors += I
if(target.client)
target.client.images |= I
target.playsound_local(get_turf(A), 'sound/machines/BoltsDown.ogg',30,0,3)
target.playsound_local(get_turf(A), 'sound/machines/boltsdown.ogg',30,0,3)
sleep(rand(6,12))
sleep(100)
for(var/image/B in doors)
if(target.client)
target.client.images.Remove(B)
target.playsound_local(get_turf(B), 'sound/machines/BoltsUp.ogg',30,0,3)
target.playsound_local(get_turf(B), 'sound/machines/boltsup.ogg',30,0,3)
sleep(rand(6,12))
qdel(src)
@@ -764,8 +731,6 @@ Gunshots/explosions/opening doors/less rare audio (done)
switch(hal_type)
if("xeno")
new /obj/effect/hallucination/xeno_attack(src.loc,src)
if("borer")
new /obj/effect/hallucination/borer(src.loc,src)
if("singulo")
new /obj/effect/hallucination/singularity_scare(src.loc,src)
if("koolaid")
@@ -792,42 +757,41 @@ Gunshots/explosions/opening doors/less rare audio (done)
new /obj/effect/hallucination/items_other(src.loc,src)
if("sounds")
//Strange audio
//to_chat(src, "Strange Audio")
switch(rand(1,20))
if(1) playsound_local(null,'sound/machines/airlock.ogg', 15, 1)
if(2)
if(prob(50)) playsound_local(null,'sound/effects/Explosion1.ogg', 50, 1)
else playsound_local(null, 'sound/effects/Explosion2.ogg', 50, 1)
if(prob(50)) playsound_local(null,'sound/effects/explosion1.ogg', 50, 1)
else playsound_local(null, 'sound/effects/explosion2.ogg', 50, 1)
if(3) playsound_local(null, 'sound/effects/explosionfar.ogg', 50, 1)
if(4) playsound_local(null, pick('sound/effects/Glassbr1.ogg','sound/effects/Glassbr2.ogg','sound/effects/Glassbr3.ogg'), 50, 1)
if(4) playsound_local(null, pick('sound/effects/glassbr1.ogg','sound/effects/glassbr2.ogg','sound/effects/glassbr3.ogg'), 50, 1)
if(5)
playsound_local(null, 'sound/weapons/ring.ogg', 35)
sleep(15)
playsound_local(null, 'sound/weapons/ring.ogg', 35)
sleep(15)
playsound_local(null, 'sound/weapons/ring.ogg', 35)
if(6) playsound_local(null, 'sound/magic/Summon_guns.ogg', 50, 1)
if(7) playsound_local(null, 'sound/machines/Alarm.ogg', 100, 0)
if(6) playsound_local(null, 'sound/magic/summon_guns.ogg', 50, 1)
if(7) playsound_local(null, 'sound/machines/alarm.ogg', 100, 0)
if(8) playsound_local(null, 'sound/voice/bfreeze.ogg', 35, 0)
if(9)
//To make it more realistic, I added two gunshots (enough to kill)
playsound_local(null, 'sound/weapons/Gunshot.ogg', 25, 1)
playsound_local(null, 'sound/weapons/gunshot.ogg', 25, 1)
spawn(rand(10,30))
playsound_local(null, 'sound/weapons/Gunshot.ogg', 25, 1)
playsound_local(null, 'sound/weapons/gunshot.ogg', 25, 1)
sleep(rand(5,10))
playsound_local(null, sound(get_sfx("bodyfall"), 25), 25, 1)
if(10) playsound_local(null, 'sound/effects/pray_chaplain.ogg', 50)
if(11)
//Same as above, but with tasers.
playsound_local(null, 'sound/weapons/Taser.ogg', 25, 1)
playsound_local(null, 'sound/weapons/taser.ogg', 25, 1)
spawn(rand(10,30))
playsound_local(null, 'sound/weapons/Taser.ogg', 25, 1)
playsound_local(null, 'sound/weapons/taser.ogg', 25, 1)
sleep(rand(5,10))
playsound_local(null, sound(get_sfx("bodyfall"), 25), 25, 1)
//Rare audio
if(12)
//These sounds are (mostly) taken from Hidden: Source
var/list/creepyasssounds = list('sound/effects/ghost.ogg', 'sound/effects/ghost2.ogg', 'sound/effects/Heart Beat.ogg', 'sound/effects/screech.ogg',\
var/list/creepyasssounds = list('sound/effects/ghost.ogg', 'sound/effects/ghost2.ogg', 'sound/effects/heart_beat.ogg', 'sound/effects/screech.ogg',\
'sound/hallucinations/behind_you1.ogg', 'sound/hallucinations/behind_you2.ogg', 'sound/hallucinations/far_noise.ogg', 'sound/hallucinations/growl1.ogg', 'sound/hallucinations/growl2.ogg',\
'sound/hallucinations/growl3.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',\
'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\
@@ -840,17 +804,17 @@ Gunshots/explosions/opening doors/less rare audio (done)
if(14)
to_chat(src, "<h1 class='alert'>Priority Announcement</h1>")
to_chat(src, "<br><br><span class='alert'>The Emergency Shuttle has docked with the station. You have 3 minutes to board the Emergency Shuttle.</span><br><br>")
playsound_local(null, 'sound/AI/shuttledock.ogg', 100)
playsound_local(null, 'sound/ai/shuttledock.ogg', 100)
//Deconstructing a wall
if(15)
playsound_local(null, 'sound/items/Welder.ogg', 15, 1)
playsound_local(null, 'sound/items/welder.ogg', 15, 1)
sleep(105)
playsound_local(null, 'sound/items/Welder2.ogg', 15, 1)
playsound_local(null, 'sound/items/welder2.ogg', 15, 1)
sleep(15)
playsound_local(null, 'sound/items/Ratchet.ogg', 15, 1)
playsound_local(null, 'sound/items/ratchet.ogg', 15, 1)
//Hacking a door
if(16)
playsound_local(null, 'sound/items/Screwdriver.ogg', 15, 1)
playsound_local(null, 'sound/items/screwdriver.ogg', 15, 1)
sleep(rand(10,30))
for(var/i = rand(1,3), i>0, i--)
playsound_local(null, 'sound/weapons/empty.ogg', 15, 1)
@@ -861,7 +825,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
if(18)
to_chat(src, "<h1 class='alert'>Biohazard Alert</h1>")
to_chat(src, "<br><br><span class='alert'>Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.</span><br><br>")
playsound_local(null, 'sound/AI/outbreak5.ogg')
playsound_local(null, 'sound/ai/outbreak5.ogg')
if(19) //Tesla loose!
playsound_local(null, 'sound/magic/lightningbolt.ogg', 35, 1)
sleep(20)
@@ -871,7 +835,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
if(20) //AI is doomsdaying!
to_chat(src, "<h1 class='alert'>Anomaly Alert</h1>")
to_chat(src, "<br><br><span class='alert'>Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.</span><br><br>")
playsound_local(null, 'sound/AI/aimalf.ogg', 100)
playsound_local(null, 'sound/ai/aimalf.ogg', 100)
if("hudscrew")
//Screwy HUD
//to_chat(src, "Screwy HUD")
@@ -1009,7 +973,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
if("death")
//Fake death
hal_screwyhud = SCREWYHUD_DEAD
SetSleeping(20, no_alert = TRUE)
SetUnconscious(400)
var/area/area = get_area(src)
to_chat(src, "<span class='deadsay'><b>[mind.name]</b> has died at <b>[area.name]</b>.</span>")
if(prob(50))
code/modules/flufftext/TextFilters.dm
+2 -2
View File
@@ -1,14 +1,14 @@
//is this shit even used at all
/proc/NewStutter(phrase,stunned)
/proc/NewStutter(phrase,stun)
phrase = html_decode(phrase)
var/list/split_phrase = splittext(phrase," ") //Split it up into words.
var/list/unstuttered_words = split_phrase.Copy()
var/i = rand(1,3)
if(stunned) i = split_phrase.len
if(stun) i = split_phrase.len
for(,i > 0,i--) //Pick a few words to stutter on.
if (!unstuttered_words.len)