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/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
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
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/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index b041aa13e70..4016a76a44f 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"
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 - 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/Anewbe - Language.yml b/html/changelogs/Anewbe - MovementSpeed.yml
similarity index 89%
rename from html/changelogs/Anewbe - Language.yml
rename to html/changelogs/Anewbe - MovementSpeed.yml
index 5046b3c47db..b28f8ee2d29 100644
--- a/html/changelogs/Anewbe - Language.yml
+++ b/html/changelogs/Anewbe - MovementSpeed.yml
@@ -33,4 +33,6 @@ delete-after: True
# 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
+ - rscadd: "Changed run/walk speed to be based only on a config file."
+ - tweak: "Walking should be faster now."
+ - tweak: "Removed shoeless slowdown."
\ 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/Anewbe - EVA Gauntlets.yml b/html/changelogs/MagmaRam - Beaker Labels.yml
similarity index 95%
rename from html/changelogs/Anewbe - EVA Gauntlets.yml
rename to html/changelogs/MagmaRam - Beaker Labels.yml
index 167d6716cfe..581e0f80aae 100644
--- a/html/changelogs/Anewbe - EVA Gauntlets.yml
+++ b/html/changelogs/MagmaRam - Beaker Labels.yml
@@ -22,7 +22,7 @@
#################################
# Your name.
-author: Anewbe
+author: MagmaRam
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
@@ -33,4 +33,4 @@ delete-after: True
# 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
+ - tweak: "Beakers can now have longer labels."
diff --git a/html/changelogs/MagmaRam - Implant.yml b/html/changelogs/MagmaRam - Defib Crate.yml
similarity index 95%
rename from html/changelogs/MagmaRam - Implant.yml
rename to html/changelogs/MagmaRam - Defib Crate.yml
index 51c44d87c53..c1b4fe349ab 100644
--- a/html/changelogs/MagmaRam - Implant.yml
+++ b/html/changelogs/MagmaRam - Defib Crate.yml
@@ -33,4 +33,4 @@ delete-after: True
# 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."
+ - rscadd: "Adds defibrilator crate for cargo."