diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index e5e5d4059ae..e8c2809a7ca 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -581,7 +581,7 @@ name = "Space Law" desc = "A set of Nanotrasen guidelines for keeping law and order on their space stations." icon_state = "bookSpaceLaw" - author = "Nanotrasen Inc." + author = "Nanotrasen" title = "Space Law" dat = {" @@ -722,8 +722,8 @@ /obj/item/weapon/book/manual/detective name = "The Film Noir: Proper Procedures for Investigations" - icon_state ="bookHacking" - author = "NanoTrasen" + icon_state ="bookDetective" + author = "Nanotrasen" title = "The Film Noir: Proper Procedures for Investigations" dat = {" @@ -759,4 +759,39 @@ It really is that easy! Good luck! + "} + +/obj/item/weapon/book/manual/nuclear + name = "Fission Mailed: Nuclear Sabotage 101" + icon_state ="bookNuclear" + author = "Syndicate" + title = "Fission Mailed: Nuclear Sabotage 101" + dat = {" + Nuclear Explosives 101:
+ Hello and thank you for choosing the Syndicate for your nuclear information needs.
+ Today's crash course will deal with the operation of a Fusion Class Nanotrasen made Nuclear Device.
+ First and foremost, DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE.
+ Pressing any button on the compacted bomb will cause it to extend and bolt itself into place.
+ If this is done to unbolt it one must completely log in which at this time may not be possible.
+ To make the nuclear device functional:
+
  • Place the nuclear device in the designated detonation zone.
    • +
  • Extend and anchor the nuclear device from its interface.
    • +
  • Insert the nuclear authorisation disk into slot.
    • +
  • Type numeric authorisation code into the keypad. This should have been provided. Note: If you make a mistake press R to reset the device. +
  • Press the E button to log onto the device.
    • + You now have activated the device. To deactivate the buttons at anytime for example when you've already prepped the bomb for detonation remove the auth disk OR press the R on the keypad.
    + Now the bomb CAN ONLY be detonated using the timer. Manual detonation is not an option.
    + Note: Nanotrasen is a pain in the neck.
    + Toggle off the SAFETY.
    + Note: You wouldn't believe how many Syndicate Operatives with doctorates have forgotten this step.
    + So use the - - and + + to set a det time between 5 seconds and 10 minutes.
    + Then press the timer toggle button to start the countdown.
    + Now remove the auth. disk so that the buttons deactivate.
    + Note: THE BOMB IS STILL SET AND WILL DETONATE
    + Now before you remove the disk if you need to move the bomb you can:
    + Toggle off the anchor, move it, and re-anchor.

    + Good luck. Remember the order:
    + Disk, Code, Safety, Timer, Disk, RUN!
    + Intelligence Analysts believe that normal Nanotrasen procedure is for the Captain to secure the nuclear authorisation disk.
    + Good luck! "} \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 63d231da6d5..db20c3c52aa 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -257,13 +257,7 @@ if(rigged && locate(/obj/item/device/radio/electropack) in src) if(isliving(user)) var/mob/living/L = user - var/protected = 0 - if(ishuman(L)) - var/mob/living/carbon/human/H = L - if(H.gloves && H.gloves.siemens_coefficient < 0.2) - protected = 1 - if(!protected) - L.electrocute_act(17, src) + if(L.electrocute_act(17, src)) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(5, 1, src) s.start() @@ -274,13 +268,13 @@ /obj/structure/closet/crate/secure/attack_hand(mob/user as mob) if(locked && !broken) if (allowed(user)) - user << "You unlock \the [src]." + user << "You unlock [src]." src.locked = 0 overlays = null overlays += greenlight return else - user << "\The [src] is locked." + user << "[src] is locked." return else ..() diff --git a/code/modules/reagents/syringe_gun.dm b/code/modules/reagents/syringe_gun.dm index 89e29932800..e7ddfb3add8 100644 --- a/code/modules/reagents/syringe_gun.dm +++ b/code/modules/reagents/syringe_gun.dm @@ -82,9 +82,7 @@ log_attack("UNKNOWN shot [M] ([M.ckey]) with a syringegun ([R])") if(D.reagents) D.reagents.trans_to(M, 15) - M.take_organ_damage(5) - for(var/mob/O in viewers(world.view, D)) - O.show_message("\red [M.name] is hit by the syringe!", 1) + M.visible_message("[M] is hit by the syringe!") del(D) if(D) diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 269e15b4ec9..7d59c8cd5a6 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ