From a8aa9d1cfa057bc0d32f9c257c2d756796aa10db Mon Sep 17 00:00:00 2001 From: Anewbe Date: Thu, 8 Dec 2016 21:26:37 -0600 Subject: [PATCH 1/9] Tweaks walking speed --- code/modules/mob/mob_movement.dm | 6 ++-- html/changelogs/Anewbe - MovementSpeed.yml | 37 ++++++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/Anewbe - MovementSpeed.yml diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 53ec10e31e2..476a8b68105 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -270,9 +270,9 @@ if("run") if(mob.drowsyness > 0) move_delay += 6 - move_delay += 1+config.run_speed + move_delay += config.run_speed if("walk") - move_delay += 7+config.walk_speed + move_delay += config.walk_speed move_delay += mob.movement_delay() var/tickcomp = 0 //moved this out here so we can use it for vehicles @@ -351,7 +351,7 @@ M.animate_movement = 2 return - else + else if(mob.confused) switch(mob.m_intent) if("run") diff --git a/html/changelogs/Anewbe - MovementSpeed.yml b/html/changelogs/Anewbe - MovementSpeed.yml new file mode 100644 index 00000000000..fbc678a024f --- /dev/null +++ b/html/changelogs/Anewbe - MovementSpeed.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Anewbe + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Changed run/walk speed to be based only on a config file." + - tweak: "Walking should be faster now." \ No newline at end of file From 68b1a3e355ae0fd536972277bbe0a59ba9251179 Mon Sep 17 00:00:00 2001 From: Neerti Date: Sat, 17 Dec 2016 03:30:14 -0500 Subject: [PATCH 2/9] Vending machines now correctly throw products --- code/datums/vending/stored_item.dm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/code/datums/vending/stored_item.dm b/code/datums/vending/stored_item.dm index 4fed107d77c..7c27776aa93 100644 --- a/code/datums/vending/stored_item.dm +++ b/code/datums/vending/stored_item.dm @@ -3,11 +3,11 @@ */ /datum/stored_item var/item_name = "name" //Name of the item(s) displayed - var/item_path = null + var/item_path = null var/amount = 0 var/list/instances //What items are actually stored var/stored //The thing holding it is - + /datum/stored_item/New(var/stored, var/path, var/name = null, var/amount = 0) src.item_path = path @@ -16,10 +16,10 @@ src.item_name = initial(tmp.name) else src.item_name = name - + src.amount = amount src.stored = stored - + ..() /datum/stored_item/Destroy() @@ -29,10 +29,10 @@ qdel(product) instances.Cut() . = ..() - + /datum/stored_item/proc/get_amount() return instances ? instances.len : amount - + /datum/stored_item/proc/get_product(var/product_location) if(!get_amount() || !product_location) return @@ -41,14 +41,15 @@ var/atom/movable/product = instances[instances.len] // Remove the last added product instances -= product product.forceMove(product_location) - + return product + /datum/stored_item/proc/add_product(var/atom/movable/product) if(product.type != item_path) return 0 init_products() product.forceMove(stored) instances += product - + /datum/stored_item/proc/init_products() if(instances) return From 617e3c2ffe18880ec3511dd07ff15ba6f15db061 Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Sat, 17 Dec 2016 09:31:58 -0600 Subject: [PATCH 3/9] Updates changelog because I gotta do this eventually --- html/changelog.html | 23 +++++++++++++ html/changelogs/.all_changelog.yml | 15 ++++++++ html/changelogs/Anewbe - EVA Gauntlets.yml | 36 -------------------- html/changelogs/Anewbe - Language.yml | 36 -------------------- html/changelogs/Anewbe - Loadout Battery.yml | 36 -------------------- html/changelogs/ForFoxSake-AtmosTweaks.yml | 8 ----- html/changelogs/MagmaRam - Implant.yml | 36 -------------------- 7 files changed, 38 insertions(+), 152 deletions(-) delete mode 100644 html/changelogs/Anewbe - EVA Gauntlets.yml delete mode 100644 html/changelogs/Anewbe - Language.yml delete mode 100644 html/changelogs/Anewbe - Loadout Battery.yml delete mode 100644 html/changelogs/ForFoxSake-AtmosTweaks.yml delete mode 100644 html/changelogs/MagmaRam - Implant.yml diff --git a/html/changelog.html b/html/changelog.html index 1165018c4a5..758ffbd6f19 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -53,6 +53,29 @@ -->
+

17 December 2016

+

Anewbe updated:

+
    +
  • EVA rig now has insulated gauntlets.
    • +
  • Adds another slot to select languages, if desired.
    • +
  • The base device cell is now selectable in the loadout.
    • +
+

ForFoxSake updated:

+
    +
  • Digital Valve pipes can now be made and moved.
    • +
  • Air Vents can now have their direction changed.
    • +
  • Atmospherics is now a little less cluttered.
    • +
+

MagmaRam updated:

+
    +
  • Added a nice implant that allows humans to speak EAL.
    • +
+

N3X15 updated:

+
    +
  • Added a changelog editing system that should cause fewer conflicts and more accurate timestamps.
    • +
  • Killed innocent kittens.
    • +
+

01 December 2016

Anewbe updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index d18c1a1e6b8..0b64439de7e 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -3174,3 +3174,18 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Yoshax: - maptweak: All Heads of Staff now get multi-color pens in their office. - tweak: Doors that do not have an access requirement can now be opened when handcuffed. +2016-12-17: + Anewbe: + - bugfix: EVA rig now has insulated gauntlets. + - rscadd: Adds another slot to select languages, if desired. + - rscadd: The base device cell is now selectable in the loadout. + ForFoxSake: + - tweak: Digital Valve pipes can now be made and moved. + - tweak: Air Vents can now have their direction changed. + - maptweak: Atmospherics is now a little less cluttered. + MagmaRam: + - rscadd: Added a nice implant that allows humans to speak EAL. + N3X15: + - rscadd: Added a changelog editing system that should cause fewer conflicts and + more accurate timestamps. + - rscdel: Killed innocent kittens. diff --git a/html/changelogs/Anewbe - EVA Gauntlets.yml b/html/changelogs/Anewbe - EVA Gauntlets.yml deleted file mode 100644 index 167d6716cfe..00000000000 --- a/html/changelogs/Anewbe - EVA Gauntlets.yml +++ /dev/null @@ -1,36 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -################################# - -# Your name. -author: Anewbe - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - bugfix: "EVA rig now has insulated gauntlets." \ No newline at end of file diff --git a/html/changelogs/Anewbe - Language.yml b/html/changelogs/Anewbe - Language.yml deleted file mode 100644 index 5046b3c47db..00000000000 --- a/html/changelogs/Anewbe - Language.yml +++ /dev/null @@ -1,36 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -################################# - -# Your name. -author: Anewbe - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - rscadd: "Adds another slot to select languages, if desired." \ No newline at end of file diff --git a/html/changelogs/Anewbe - Loadout Battery.yml b/html/changelogs/Anewbe - Loadout Battery.yml deleted file mode 100644 index 5fe0751b0fd..00000000000 --- a/html/changelogs/Anewbe - Loadout Battery.yml +++ /dev/null @@ -1,36 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -################################# - -# Your name. -author: Anewbe - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - rscadd: "The base device cell is now selectable in the loadout." \ No newline at end of file diff --git a/html/changelogs/ForFoxSake-AtmosTweaks.yml b/html/changelogs/ForFoxSake-AtmosTweaks.yml deleted file mode 100644 index 40100f11c7e..00000000000 --- a/html/changelogs/ForFoxSake-AtmosTweaks.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: ForFoxSake - -delete-after: True - -changes: - - tweak: "Digital Valve pipes can now be made and moved." - - tweak: "Air Vents can now have their direction changed." - - maptweak: "Atmospherics is now a little less cluttered." \ No newline at end of file diff --git a/html/changelogs/MagmaRam - Implant.yml b/html/changelogs/MagmaRam - Implant.yml deleted file mode 100644 index 51c44d87c53..00000000000 --- a/html/changelogs/MagmaRam - Implant.yml +++ /dev/null @@ -1,36 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -################################# - -# Your name. -author: MagmaRam - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - rscadd: "Added a nice implant that allows humans to speak EAL." From d3be058c5dd55cb527f5c4516ed9b15326571f72 Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Sat, 17 Dec 2016 09:46:05 -0600 Subject: [PATCH 4/9] Adds a crate with defibrilators for 30 points --- code/datums/supplypacks/medical.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/datums/supplypacks/medical.dm b/code/datums/supplypacks/medical.dm index 3972114440f..18f18db6723 100644 --- a/code/datums/supplypacks/medical.dm +++ b/code/datums/supplypacks/medical.dm @@ -306,4 +306,11 @@ cost = 25 containertype = "/obj/structure/closet/crate/secure" containername = "Virus sample crate" - access = access_cmo \ No newline at end of file + access = access_cmo + +/datum/supply_packs/med/defib + name = "Defibrilator crate" + contains = list(/obj/item/device/defib_kit = 4) + cost = 30 + containertype = /obj/structure/closet/crate/medical + containername = "Defibrilator crate" \ No newline at end of file From 52f3ee7e198b778a4157b0bb757c3ca5f154fda8 Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Sat, 17 Dec 2016 09:47:05 -0600 Subject: [PATCH 5/9] Labels for beakers can now be longer, and are in the description, too. --- code/modules/reagents/reagent_containers/glass.dm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index b041aa13e70..7b7cb189070 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -6,6 +6,7 @@ name = " " var/base_name = " " desc = " " + var/base_desc = " " icon = 'icons/obj/chemical.dmi' icon_state = "null" item_state = "null" @@ -48,6 +49,7 @@ /obj/item/weapon/reagent_containers/glass/New() ..() base_name = name + base_desc = desc /obj/item/weapon/reagent_containers/glass/examine(var/mob/user) if(!..(user, 2)) @@ -99,8 +101,12 @@ /obj/item/weapon/reagent_containers/glass/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen)) var/tmp_label = sanitizeSafe(input(user, "Enter a label for [name]", "Label", label_text), MAX_NAME_LEN) - if(length(tmp_label) > 10) - user << "The label can be at most 10 characters long." + if(length(tmp_label) > 50) + user << "The label can be at most 50 characters long." + else if(length(tmp_label) > 10) + user << "You set the label." + label_text = tmp_label + update_name_label() else user << "You set the label to \"[tmp_label]\"." label_text = tmp_label @@ -109,8 +115,12 @@ /obj/item/weapon/reagent_containers/glass/proc/update_name_label() if(label_text == "") name = base_name + else if(length(label_text) > 10) + var/short_label_text = copytext(label_text, 1, 11) + name = "[base_name] ([short_label_text]...)" else name = "[base_name] ([label_text])" + desc = "[base_desc] It is labeled \"[label_text]\"." /obj/item/weapon/reagent_containers/glass/beaker name = "beaker" From 4ae1e58a83019e8592706e12faa6e2b16ed5f5bf Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Sat, 17 Dec 2016 10:18:18 -0600 Subject: [PATCH 6/9] changelogoogogogog --- html/changelogs/MagmaRam - Defib Crate.yml | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/MagmaRam - Defib Crate.yml diff --git a/html/changelogs/MagmaRam - Defib Crate.yml b/html/changelogs/MagmaRam - Defib Crate.yml new file mode 100644 index 00000000000..c1b4fe349ab --- /dev/null +++ b/html/changelogs/MagmaRam - Defib Crate.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: MagmaRam + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds defibrilator crate for cargo." From 8ce21f351c7458900d9ffa619aa1a67638c0cdbb Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Sat, 17 Dec 2016 10:19:57 -0600 Subject: [PATCH 7/9] Changelog file --- html/changelogs/MagmaRam - Beaker Labels.yml | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/MagmaRam - Beaker Labels.yml diff --git a/html/changelogs/MagmaRam - Beaker Labels.yml b/html/changelogs/MagmaRam - Beaker Labels.yml new file mode 100644 index 00000000000..581e0f80aae --- /dev/null +++ b/html/changelogs/MagmaRam - Beaker Labels.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: MagmaRam + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Beakers can now have longer labels." From 4d8c2aaa3e676be0130112491398451375032d4b Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Sat, 17 Dec 2016 10:25:59 -0600 Subject: [PATCH 8/9] hurf durf dumb html mistake --- code/modules/reagents/reagent_containers/glass.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 7b7cb189070..4016a76a44f 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -104,7 +104,7 @@ if(length(tmp_label) > 50) user << "The label can be at most 50 characters long." else if(length(tmp_label) > 10) - user << "You set the label." + user << "You set the label." label_text = tmp_label update_name_label() else From f9d7ad9d161995eea315a991f8468b4b39a274b1 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 17 Dec 2016 16:07:38 -0600 Subject: [PATCH 9/9] Walking barefoot no longer slows you. --- code/__defines/items_clothing.dm | 2 +- html/changelogs/Anewbe - MovementSpeed.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/__defines/items_clothing.dm b/code/__defines/items_clothing.dm index 4295ceaed1c..eb572aa0e29 100644 --- a/code/__defines/items_clothing.dm +++ b/code/__defines/items_clothing.dm @@ -1,6 +1,6 @@ #define HUMAN_STRIP_DELAY 40 // Takes 40ds = 4s to strip someone. -#define SHOES_SLOWDOWN -1.0 // How much shoes slow you down by default. Negative values speed you up. +#define SHOES_SLOWDOWN 0 // How much shoes slow you down by default. Negative values speed you up. #define CANDLE_LUM 3 // For how bright candles are. diff --git a/html/changelogs/Anewbe - MovementSpeed.yml b/html/changelogs/Anewbe - MovementSpeed.yml index fbc678a024f..b28f8ee2d29 100644 --- a/html/changelogs/Anewbe - MovementSpeed.yml +++ b/html/changelogs/Anewbe - MovementSpeed.yml @@ -34,4 +34,5 @@ delete-after: True # Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. changes: - rscadd: "Changed run/walk speed to be based only on a config file." - - tweak: "Walking should be faster now." \ No newline at end of file + - tweak: "Walking should be faster now." + - tweak: "Removed shoeless slowdown." \ No newline at end of file