woo
This commit is contained in:
LetterJay
@@ -1,10 +0,0 @@
|
||||
diff a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm (rejected hunks)
|
||||
@@ -520,7 +520,7 @@ var/list/teleport_runes = list()
|
||||
|
||||
//Rite of Resurrection: Requires the corpse of a cultist and that there have been less revives than the number of people sacrificed
|
||||
/obj/effect/rune/raise_dead
|
||||
- cultist_name = "Raise Dead"
|
||||
+ cultist_name = "Resurrect Cultist"
|
||||
cultist_desc = "requires the corpse of a cultist placed upon the rune. Provided there have been sufficient sacrifices, they will be revived."
|
||||
invocation = null //Depends on the name of the user - see below
|
||||
icon_state = "1"
|
||||
@@ -1,18 +0,0 @@
|
||||
diff a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm (rejected hunks)
|
||||
@@ -81,12 +81,12 @@
|
||||
spawn (ROUNDSTART_LOGOUT_REPORT_TIME)
|
||||
display_roundstart_logout_report()
|
||||
|
||||
- feedback_set_details("round_start","[time2text(world.realtime)]")
|
||||
+ SSblackbox.set_details("round_start","[time2text(world.realtime)]")
|
||||
if(SSticker && SSticker.mode)
|
||||
- feedback_set_details("game_mode","[SSticker.mode]")
|
||||
+ SSblackbox.set_details("game_mode","[SSticker.mode]")
|
||||
if(GLOB.revdata.commit)
|
||||
- feedback_set_details("revision","[GLOB.revdata.commit]")
|
||||
- feedback_set_details("server_ip","[world.internet_address]:[world.port]")
|
||||
+ SSblackbox.set_details("revision","[GLOB.revdata.commit]")
|
||||
+ SSblackbox.set_details("server_ip","[world.internet_address]:[world.port]")
|
||||
if(report)
|
||||
spawn (rand(waittime_l, waittime_h))
|
||||
send_intercept(0)
|
||||
@@ -1,28 +0,0 @@
|
||||
diff a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm (rejected hunks)
|
||||
@@ -343,7 +343,7 @@
|
||||
if(mess) //Clean that mess and dump those gibs!
|
||||
mess = FALSE
|
||||
for(var/obj/A in contents)
|
||||
- if(istype(A, /obj/item/organ) || istype(A, /obj/effect/decal/cleanable/blood/gibs))
|
||||
+ if(istype(A, /obj/effect/decal/cleanable/blood/gibs))
|
||||
A.forceMove(T)
|
||||
audible_message("<span class='italics'>You hear a splat.</span>")
|
||||
icon_state = "pod_0"
|
||||
@@ -378,10 +378,13 @@
|
||||
to_chat(occupant, "<span class='warning'><b>Agony blazes across your consciousness as your body is torn apart.</b><br><i>Is this what dying is like? Yes it is.</i></span>")
|
||||
playsound(src.loc, 'sound/machines/warning-buzzer.ogg', 50, 0)
|
||||
occupant << sound('sound/hallucinations/veryfar_noise.ogg',0,1,50)
|
||||
- var/obj/item/organ/brain/B = occupant.getorganslot("brain")
|
||||
- B.Remove(occupant)
|
||||
- B.forceMove(src)
|
||||
- occupant.gib(TRUE, TRUE, TRUE)
|
||||
+ addtimer(CALLBACK(src, .proc/end_malfunction, occupant), 40)
|
||||
+
|
||||
+/obj/machinery/clonepod/proc/end_malfunction(mob/victim)
|
||||
+ if(!istype(victim)) //Where the hell did they go?
|
||||
+ return
|
||||
+ victim.ghostize(FALSE)
|
||||
+ victim.gib(TRUE, TRUE, TRUE)
|
||||
|
||||
/obj/machinery/clonepod/relaymove(mob/user)
|
||||
if(user.stat == CONSCIOUS)
|
||||
@@ -1,33 +0,0 @@
|
||||
diff a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm (rejected hunks)
|
||||
@@ -142,30 +142,7 @@
|
||||
// --- This following recording is intended for research and feedback in the use of department radio channels ---
|
||||
|
||||
var/blackbox_msg = "[AM] [AM.say_quote(message, spans)]"
|
||||
- if(istype(GLOB.blackbox))
|
||||
- switch(freq)
|
||||
- if(1459)
|
||||
- GLOB.blackbox.msg_common += blackbox_msg
|
||||
- if(1351)
|
||||
- GLOB.blackbox.msg_science += blackbox_msg
|
||||
- if(1353)
|
||||
- GLOB.blackbox.msg_command += blackbox_msg
|
||||
- if(1355)
|
||||
- GLOB.blackbox.msg_medical += blackbox_msg
|
||||
- if(1357)
|
||||
- GLOB.blackbox.msg_engineering += blackbox_msg
|
||||
- if(1359)
|
||||
- GLOB.blackbox.msg_security += blackbox_msg
|
||||
- if(1441)
|
||||
- GLOB.blackbox.msg_deathsquad += blackbox_msg
|
||||
- if(1213)
|
||||
- GLOB.blackbox.msg_syndicate += blackbox_msg
|
||||
- if(1349)
|
||||
- GLOB.blackbox.msg_service += blackbox_msg
|
||||
- if(1347)
|
||||
- GLOB.blackbox.msg_cargo += blackbox_msg
|
||||
- else
|
||||
- GLOB.blackbox.messages += blackbox_msg
|
||||
+ SSblackbox.LogBroadcast(blackbox_msg, freq)
|
||||
|
||||
spawn(50)
|
||||
qdel(virt)
|
||||
@@ -1,10 +0,0 @@
|
||||
diff a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm (rejected hunks)
|
||||
@@ -528,7 +528,7 @@
|
||||
if(icon_vend) //Show the vending animation if needed
|
||||
flick(icon_vend,src)
|
||||
new R.product_path(get_turf(src))
|
||||
- feedback_add_details("vending_machine_usage","[R.product_path]|[src.type]")
|
||||
+ SSblackbox.add_details("vending_machine_usage","[R.product_path]|[src.type]")
|
||||
vend_ready = 1
|
||||
return
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
diff a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm (rejected hunks)
|
||||
@@ -46,9 +46,9 @@
|
||||
apply_cuffs(C,user)
|
||||
to_chat(user, "<span class='notice'>You handcuff [C].</span>")
|
||||
if(istype(src, /obj/item/weapon/restraints/handcuffs/cable))
|
||||
- feedback_add_details("handcuffs","C")
|
||||
+ SSblackbox.add_details("handcuffs","C")
|
||||
else
|
||||
- feedback_add_details("handcuffs","H")
|
||||
+ SSblackbox.add_details("handcuffs","H")
|
||||
|
||||
add_logs(user, C, "handcuffed")
|
||||
else
|
||||
@@ -278,7 +278,7 @@
|
||||
C.legcuffed = src
|
||||
src.loc = C
|
||||
C.update_inv_legcuffed()
|
||||
- feedback_add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart.
|
||||
+ SSblackbox.add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart.
|
||||
else if(isanimal(L))
|
||||
var/mob/living/simple_animal/SA = L
|
||||
if(SA.mob_size > MOB_SIZE_TINY)
|
||||
@@ -341,7 +341,7 @@
|
||||
C.legcuffed = src
|
||||
src.loc = C
|
||||
C.update_inv_legcuffed()
|
||||
- feedback_add_details("handcuffs","B")
|
||||
+ SSblackbox.add_details("handcuffs","B")
|
||||
to_chat(C, "<span class='userdanger'>\The [src] ensnares you!</span>")
|
||||
C.Weaken(weaken)
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
diff a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm (rejected hunks)
|
||||
@@ -64,7 +64,7 @@
|
||||
if(ismineralturf(src))
|
||||
to_chat(user, "<span class='notice'>You finish cutting into the rock.</span>")
|
||||
gets_drilled(user)
|
||||
- feedback_add_details("pick_used_mining","[P.type]")
|
||||
+ SSblackbox.add_details("pick_used_mining","[P.type]")
|
||||
else
|
||||
return attack_hand(user)
|
||||
return
|
||||
@@ -74,7 +74,7 @@
|
||||
var/i
|
||||
for (i=0;i<mineralAmt;i++)
|
||||
new mineralType(src)
|
||||
- feedback_add_details("ore_mined","[mineralType]|[mineralAmt]")
|
||||
+ SSblackbox.add_details("ore_mined","[mineralType]|[mineralAmt]")
|
||||
ChangeTurf(turf_type, defer_change)
|
||||
addtimer(CALLBACK(src, .proc/AfterChange), 1, TIMER_UNIQUE)
|
||||
playsound(src, 'sound/effects/break_stone.ogg', 50, 1) //beautiful destruction
|
||||
Reference in New Issue
Block a user