Fixes #3770
Fixes #3802
Resolves #3682 (stop all sounds verb)
Fixes #3804
Fixes #3789
Fixes #3558
Fixes #3549
Resolves #3745
This commit is contained in:
Ron
2017-11-05 09:20:51 -05:00
committed by Erki
parent 36b6642c83
commit bf77cbe426
11 changed files with 36 additions and 5 deletions
@@ -235,6 +235,7 @@
t1 += "[printedmessage]<BR>"
P.info = t1
P.name = "Transcript"
usr.put_in_hands(P)
canprint = 0
sleep(300)
canprint = 1
+1 -1
View File
@@ -415,7 +415,7 @@
var/atype = alert(usr, "Do you want to fill or empty \the [RG] at \the [src]?", "Fill or Empty", "Fill", "Empty", "Cancel")
if(!usr.Adjacent(src)) return
if(RG.loc != usr || (usr.l_hand != RG && usr.r_hand != RG)) return
if(RG.loc != usr) return
if(busy)
usr << "<span class='warning'>Someone's already using \the [src].</span>"
return
+10
View File
@@ -148,3 +148,13 @@
prefix = ""
if((target.mob in messagemobs) || display_remote)
target << "<span class='ooc'><span class='looc'>" + create_text_tag("looc", "LOOC:", target) + " <span class='prefix'>[prefix]</span><EM>[display_name][admin_stuff]:</EM> <span class='message'>[msg]</span></span></span>"
/client/verb/stop_all_sounds()
set name = "Stop all sounds"
set desc = "Stop all sounds that are currently playing."
set category = "OOC"
if(!mob)
return
mob << sound(null)
+3
View File
@@ -278,6 +278,9 @@
if(H.stat == DEAD) // He's dead, Jim
return null
if(isipc(H))
return null
if(H in ignored)
return null
@@ -310,6 +310,7 @@
/mob/living/silicon/robot/drone/proc/transfer_personality(var/client/player)
if(!player) return
stat = 0
src.ckey = player.ckey
if(player.mob && player.mob.mind)
+5 -4
View File
@@ -8,13 +8,13 @@
var/max_paper = 10
var/paperamount = 0
var/list/shred_amounts = list(
/obj/item/weapon/photo = 1,
/obj/item/weapon/photo = -1,
/obj/item/weapon/shreddedp = 1,
/obj/item/weapon/paper = 1,
/obj/item/weapon/newspaper = 3,
/obj/item/weapon/card/id = 3,
/obj/item/weapon/card/id = -1,
/obj/item/weapon/paper_bundle = 3
)
)// use -1 if it doesn't generate paper
/obj/machinery/papershredder/attackby(var/obj/item/W, var/mob/user)
if (istype(W, /obj/item/weapon/storage))
@@ -43,7 +43,8 @@
if(paperamount == max_paper)
user << "<span class='warning'>\The [src] is full; please empty it before you continue.</span>"
return
paperamount += paper_result
if (paper_result > 0)
paperamount += paper_result
user.drop_from_inventory(W)
qdel(W)
playsound(src.loc, 'sound/items/pshred.ogg', 75, 1)
+14
View File
@@ -0,0 +1,14 @@
author: Printer16
delete-after: True
changes:
- bugfix: "You can now reboot maintenance drones."
- bugfix: "Universal recorder transcripts are now printed into your hand."
- rscadd: "Added a stop all sounds verb located in the OOC tab."
- bugfix: "Shredding ID cards no longer generates paper."
- bugfix: "Borgs can now fill up buckets/beakers/other containers by using the sink."
- tweak: "The AI help menu has been updated."
- tweak: "Updated the NanoUI map."
- bugfix: "Medbots no longer try to heal IPCs."
+1
View File
@@ -18,5 +18,6 @@ Software are abilities that have to be unlocked via research menu (Hardware tab)
<b>Networking</b> - Hacking-oriented abilities. T1 ability is Basic Encryption Hack, which allows you to hack more APCs. Higher tiers allow faking centcom messages, and even setting alert level. T4 ability is System Override, that rapidly hacks remaining APCs and gives you access to station self destruct sequence.<br>
<b>Interdiction</b> - Sabotage-oriented abilities. T1 ability allows you to recall emergency shuttle. Higher level abilities allow you to unlock cyborgs even without access to robotics console, and T4 ability allows you to hack other AIs to slave them under your control.<br>
<b>Manipulation</b> - Physical-oriented abilities. T1 ability allows you to break few lights, and rarely even APCs. T2 ability allows you to apply upgrade of your choice to camera, or reactivate broken camera. T3 ability allows you to create weak forcefield, that holds air, but won't last for long. And T4 ability allows you to overload machines, detonating them in weak explosion.<br>
<b>Synthetic Takeover</b> - Abilities revolving around you and your minions. T1 ability allows you to reset your cyborgs module. T2 ability allows you to hack IPCs. T3 ability allows you to make your cyborgs stronger And T4 ability allows you to take over the stations electronics and unlocks a human to cyborg converting machine.<br>
<h2>End</h2><br>
If you still have some questions, either check the wiki, ask on IRC, or adminhelp and ask your friendly administration staff.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 97 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 111 KiB