From 8525d37de4984be1f5449ead7f2966857ef59722 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Mon, 1 Jun 2015 09:33:03 +0200 Subject: [PATCH 1/6] Travis changes. Adds python libs needed to run the changelog script, ensuring only proper log entries are made. --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 81b8487f48..948be8cfe5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,10 @@ env: before_install: - sudo apt-get update -qq - sudo apt-get install libc6:i386 libgcc1:i386 libstdc++6:i386 -qq + - sudo apt-get install python -qq + - sudo apt-get install python-pip -qq + - sudo pip install PyYaml -q + - sudo pip install beautifulsoup4 -q install: - curl "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip @@ -22,3 +26,4 @@ script: - (! find nano/templates/ -type f -exec md5sum {} + | sort | uniq -D -w 32 | grep nano) - ( md5sum -c - <<< "0af969f671fba6cf9696c78cd175a14a *baystation12.int") - DreamMaker baystation12.dme + - python tools/GenerateChangelog/ss13_genchangelog.py html/changelog.html html/changelogs From 864d18caff24d4766819379f6f81ca4962c6730c Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Mon, 1 Jun 2015 10:09:38 +0200 Subject: [PATCH 2/6] Updates the list of valid log prefixes. --- tools/GenerateChangelog/ss13_genchangelog.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/GenerateChangelog/ss13_genchangelog.py b/tools/GenerateChangelog/ss13_genchangelog.py index 472fbc69aa..6f434a8d25 100644 --- a/tools/GenerateChangelog/ss13_genchangelog.py +++ b/tools/GenerateChangelog/ss13_genchangelog.py @@ -53,9 +53,9 @@ validPrefixes = [ 'rscadd', 'imageadd', 'imagedel', + 'maptweak', 'spellcheck', - 'experiment', - 'tgs' + 'experiment' ] def dictToTuples(inp): From 63f253a301c3a3f0462abf29e31cc69a004adeb8 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Mon, 1 Jun 2015 17:17:16 +0100 Subject: [PATCH 3/6] 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 4/6] 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) From 5ebece6368125e786da85b0a1a4e5ab6bec8134d Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Tue, 2 Jun 2015 02:24:32 +0100 Subject: [PATCH 5/6] Spawn fixes Fixes spawning a chem dispenser spamming the log with label settings Fixes Spawn-Fruit and Spawn-Plant not being usable from hotbar Fixes Spawn-Fruit and Spawn-Plant not producing admin logs (file only) Allows spawning dispenser cartridges with different sizes and reagents --- baystation12.dme | 1 + code/modules/admin/admin.dm | 8 ++++---- code/modules/admin/admin_verbs.dm | 3 ++- code/modules/reagents/dispenser/cartridge.dm | 16 ++++++++++------ .../reagents/dispenser/cartridge_spawn.dm | 13 +++++++++++++ 5 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 code/modules/reagents/dispenser/cartridge_spawn.dm diff --git a/baystation12.dme b/baystation12.dme index bbdcaa38ea..93041deb13 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1485,6 +1485,7 @@ #include "code\modules\reagents\dispenser\_defines.dm" #include "code\modules\reagents\dispenser\cartridge.dm" #include "code\modules\reagents\dispenser\cartridge_presets.dm" +#include "code\modules\reagents\dispenser\cartridge_spawn.dm" #include "code\modules\reagents\dispenser\dispenser2.dm" #include "code\modules\reagents\dispenser\dispenser_presets.dm" #include "code\modules\reagents\dispenser\supply.dm" diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 7d29322163..6158c59bc8 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -997,18 +997,18 @@ var/global/floorIsLava = 0 return 0 -/datum/admins/proc/spawn_fruit() +/datum/admins/proc/spawn_fruit(seedtype in plant_controller.seeds) set category = "Debug" set desc = "Spawn the product of a seed." set name = "Spawn Fruit" if(!check_rights(R_SPAWN)) return - var/seedtype = input("Select a seed type", "Spawn Fruit") as null|anything in plant_controller.seeds if(!seedtype || !plant_controller.seeds[seedtype]) return var/datum/seed/S = plant_controller.seeds[seedtype] S.harvest(usr,0,0,1) + log_admin("[key_name(usr)] spawned [seedtype] fruit at ([usr.x],[usr.y],[usr.z])") /datum/admins/proc/spawn_custom_item() set category = "Debug" @@ -1050,17 +1050,17 @@ var/global/floorIsLava = 0 for(var/datum/custom_item/item in current_items) usr << "- name: [item.name] icon: [item.item_icon] path: [item.item_path] desc: [item.item_desc]" -/datum/admins/proc/spawn_plant() +/datum/admins/proc/spawn_plant(seedtype in plant_controller.seeds) set category = "Debug" set desc = "Spawn a spreading plant effect." set name = "Spawn Plant" if(!check_rights(R_SPAWN)) return - var/seedtype = input("Select a seed type", "Spawn Plant") as null|anything in plant_controller.seeds if(!seedtype || !plant_controller.seeds[seedtype]) return new /obj/effect/plant(get_turf(usr), plant_controller.seeds[seedtype]) + log_admin("[key_name(usr)] spawned [seedtype] vines at ([usr.x],[usr.y],[usr.z])") /datum/admins/proc/spawn_atom(var/object as text) set category = "Debug" diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index c22fc85466..41acc7894b 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -123,7 +123,8 @@ var/list/admin_verbs_spawn = list( /client/proc/FireLaser, /client/proc/FireCannons, /client/proc/ChangeIcarusPosition, - /client/proc/virus2_editor + /client/proc/virus2_editor, + /client/proc/spawn_chemdisp_cartridge ) var/list/admin_verbs_server = list( /client/proc/Set_Holiday, diff --git a/code/modules/reagents/dispenser/cartridge.dm b/code/modules/reagents/dispenser/cartridge.dm index fdb5e1fe76..569da4cc73 100644 --- a/code/modules/reagents/dispenser/cartridge.dm +++ b/code/modules/reagents/dispenser/cartridge.dm @@ -30,19 +30,23 @@ if(!is_open_container()) user << "The cap is sealed." -/obj/item/weapon/reagent_containers/chem_disp_cartridge/verb/setLabel(L as text) +/obj/item/weapon/reagent_containers/chem_disp_cartridge/verb/verb_set_label(L as text) set name = "Set Cartridge Label" set category = "Object" set src in view(usr, 1) + + setLabel(L, usr) + +/obj/item/weapon/reagent_containers/chem_disp_cartridge/proc/setLabel(L, mob/user = null) if(L) - if(usr) - usr << "You set the label on \the [src] to '[L]'." + if(user) + user << "You set the label on \the [src] to '[L]'." label = L name = "[initial(name)] - '[L]'" else - if(usr) - usr << "You clear the label on \the [src]." + if(user) + user << "You clear the label on \the [src]." label = "" name = initial(name) @@ -87,4 +91,4 @@ user << "You transfer [trans] units of the solution to \the [target]." else - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/reagents/dispenser/cartridge_spawn.dm b/code/modules/reagents/dispenser/cartridge_spawn.dm new file mode 100644 index 0000000000..730e191891 --- /dev/null +++ b/code/modules/reagents/dispenser/cartridge_spawn.dm @@ -0,0 +1,13 @@ +/client/proc/spawn_chemdisp_cartridge(size in list("small", "medium", "large"), reagent in chemical_reagents_list) + set name = "Spawn Chemical Dispenser Cartridge" + set category = "Admin" + + var/obj/item/weapon/reagent_containers/chem_disp_cartridge/C + switch(size) + if("small") C = new /obj/item/weapon/reagent_containers/chem_disp_cartridge/small(usr.loc) + if("medium") C = new /obj/item/weapon/reagent_containers/chem_disp_cartridge/medium(usr.loc) + if("large") C = new /obj/item/weapon/reagent_containers/chem_disp_cartridge(usr.loc) + C.reagents.add_reagent(reagent, C.volume) + var/datum/reagent/R = chemical_reagents_list[reagent] + C.setLabel(R.name) + log_admin("[key_name(usr)] spawned a [size] reagent container containing [reagent] at ([usr.x],[usr.y],[usr.z])") From 4d9c4ee9bae1229da1c7d85961da6f3c3dfa519c Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Tue, 2 Jun 2015 13:15:38 +0200 Subject: [PATCH 6/6] Updates changelog. --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/Techhead-survivalBoxFix.yml | 4 ---- 3 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/Techhead-survivalBoxFix.yml diff --git a/html/changelog.html b/html/changelog.html index 2b6c178b20..518709a83b 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

02 June 2015

+

Techhead updated:

+
    +
  • Re-adds extended capacity emergency oxygen tanks to relevant jobs.
    • +
+

30 May 2015

Atlantis updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 0778bd50f3..0b48f16545 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -1867,3 +1867,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. PsiOmegaDelta: - rscadd: You can now review the server revision date and hash by using the 'Show Server Revision' verb in the OOC category. +2015-06-02: + Techhead: + - rscadd: Re-adds extended capacity emergency oxygen tanks to relevant jobs. diff --git a/html/changelogs/Techhead-survivalBoxFix.yml b/html/changelogs/Techhead-survivalBoxFix.yml deleted file mode 100644 index 664e3edf0c..0000000000 --- a/html/changelogs/Techhead-survivalBoxFix.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Techhead -delete-after: True -changes: - - rscadd: "Re-adds extended capacity emergency oxygen tanks to relevant jobs."