From 63f253a301c3a3f0462abf29e31cc69a004adeb8 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Mon, 1 Jun 2015 17:17:16 +0100 Subject: [PATCH 1/2] Makes hyposprays start empty --- code/modules/reagents/reagent_containers/hypospray.dm | 9 ++++----- html/changelogs/Yoshax-emptypls.xml | 5 +++++ 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/Yoshax-emptypls.xml diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index fd3557b62f..f9776c04d2 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -14,10 +14,10 @@ flags = OPENCONTAINER slot_flags = SLOT_BELT -/obj/item/weapon/reagent_containers/hypospray/New() //comment this to make hypos start off empty - ..() - reagents.add_reagent("tricordrazine", 30) - return +///obj/item/weapon/reagent_containers/hypospray/New() //comment this to make hypos start off empty +// ..() +// reagents.add_reagent("tricordrazine", 30) +// return /obj/item/weapon/reagent_containers/hypospray/attack(mob/M as mob, mob/user as mob) if(!reagents.total_volume) @@ -55,7 +55,6 @@ /obj/item/weapon/reagent_containers/hypospray/autoinjector/New() ..() - reagents.remove_reagent("tricordrazine", 30) reagents.add_reagent("inaprovaline", 5) update_icon() return diff --git a/html/changelogs/Yoshax-emptypls.xml b/html/changelogs/Yoshax-emptypls.xml new file mode 100644 index 0000000000..2c90ae8008 --- /dev/null +++ b/html/changelogs/Yoshax-emptypls.xml @@ -0,0 +1,5 @@ +author: Yoshax +delete-after: True + +changes: + - tweak: "Makes hyposprays start empty instead of filled with Tricord." \ No newline at end of file From 0aade86d5f28aa81fcc86b1fbd5e466561fb2923 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Mon, 1 Jun 2015 19:43:54 +0200 Subject: [PATCH 2/2] Admin PM replies now sent to IRC. Now both ahelps and their replies should be sent to an IRC channel, if configured. --- code/modules/admin/verbs/adminpm.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 1c358c8cf4..2c0889f3b2 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -107,6 +107,7 @@ C << 'sound/effects/adminhelp.ogg' log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]") + send2adminirc("Reply: [key_name(src)]->[key_name(C)]: [html_decode(msg)]") //we don't use message_admins here because the sender/receiver might get it too for(var/client/X in admins)