From 1426392904e6c5d60ce556ab81031b9050e4c2db Mon Sep 17 00:00:00 2001 From: Werner Date: Mon, 6 Mar 2017 22:56:19 +0100 Subject: [PATCH 1/4] Price Changes requested by Jackboot (#1892) Change the prices as requested by Jackboot --- code/game/machinery/vending.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index f5f4016c97c..47df9f9869c 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -722,7 +722,7 @@ vend_power_usage = 85000 //85 kJ to heat a 250 mL cup of coffee products = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 25,/obj/item/weapon/reagent_containers/food/drinks/tea = 25,/obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 25) contraband = list(/obj/item/weapon/reagent_containers/food/drinks/ice = 10) - prices = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 30, /obj/item/weapon/reagent_containers/food/drinks/tea = 30, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 32) + prices = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 20, /obj/item/weapon/reagent_containers/food/drinks/tea = 20, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 22) @@ -738,10 +738,10 @@ /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 6, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 6, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 3, /obj/item/weapon/reagent_containers/food/snacks/meatsnack = 2, /obj/item/weapon/reagent_containers/food/snacks/maps = 2, /obj/item/weapon/reagent_containers/food/snacks/nathisnack = 2) contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6) - prices = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 25,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 30,/obj/item/weapon/reagent_containers/food/snacks/chips = 27, - /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 30,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 22,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 25, - /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 25, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 28, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 50, - /obj/item/weapon/reagent_containers/food/snacks/meatsnack = 32, /obj/item/weapon/reagent_containers/food/snacks/maps = 33, /obj/item/weapon/reagent_containers/food/snacks/nathisnack = 34) + prices = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 15,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 20,/obj/item/weapon/reagent_containers/food/snacks/chips = 17, + /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 20,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 12,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 15, + /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 15, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 18, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 40, + /obj/item/weapon/reagent_containers/food/snacks/meatsnack = 22, /obj/item/weapon/reagent_containers/food/snacks/maps = 23, /obj/item/weapon/reagent_containers/food/snacks/nathisnack = 24) /obj/machinery/vending/cola @@ -755,10 +755,10 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 10,/obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 10) contraband = list(/obj/item/weapon/reagent_containers/food/drinks/cans/thirteenloko = 5, /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 6) - prices = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 25,/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 21, - /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 26,/obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 25, - /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 22,/obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 25, - /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 23,/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 26) + prices = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 15,/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 11, + /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 16,/obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 15, + /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 12,/obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 15, + /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 13,/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 16) idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. //This one's from bay12 @@ -783,7 +783,7 @@ products = list(/obj/item/weapon/storage/fancy/cigarettes = 10,/obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/flame/lighter/random = 4) contraband = list(/obj/item/weapon/flame/lighter/zippo = 4) premium = list(/obj/item/weapon/storage/fancy/cigar = 5,/obj/item/weapon/storage/fancy/cigarettes/killthroat = 5 ) - prices = list(/obj/item/weapon/storage/fancy/cigarettes = 520,/obj/item/weapon/storage/box/matches = 22,/obj/item/weapon/flame/lighter/random = 22) + prices = list(/obj/item/weapon/storage/fancy/cigarettes = 510,/obj/item/weapon/storage/box/matches = 12,/obj/item/weapon/flame/lighter/random = 12) /obj/machinery/vending/medical From 9856e18486d5a1b17bc6a65ef480ae76e04d5077 Mon Sep 17 00:00:00 2001 From: LordFowl Date: Sun, 12 Mar 2017 05:50:18 -0400 Subject: [PATCH 2/4] Fixes internal phoron buzz (#1908) Due to bad code andn stuff, buzz happened every 3 secobds. no more. --- code/modules/organs/organ_internal.dm | 2 +- html/changelogs/LordFowl - 1138.yml | 36 +++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/LordFowl - 1138.yml diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm index 0564b37e479..50ffd360d96 100644 --- a/code/modules/organs/organ_internal.dm +++ b/code/modules/organs/organ_internal.dm @@ -433,7 +433,7 @@ obj/item/organ/vaurca/neuralsocket/process() return null var/tank_pressure = air_contents.return_pressure() - if(tank_pressure < distribute_pressure) + if((tank_pressure < distribute_pressure) && prob(5)) owner << "There is a buzzing in your [parent_organ]." var/moles_needed = distribute_pressure*volume_to_return/(R_IDEAL_GAS_EQUATION*air_contents.temperature) diff --git a/html/changelogs/LordFowl - 1138.yml b/html/changelogs/LordFowl - 1138.yml new file mode 100644 index 00000000000..88ce238d484 --- /dev/null +++ b/html/changelogs/LordFowl - 1138.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: LordFowl + +# 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: "Fixed chest-buzzers in Vaurca." From 07475b3b52a72f7881208ea37cbafe6d8139053a Mon Sep 17 00:00:00 2001 From: Alberyk Date: Fri, 17 Mar 2017 19:33:24 -0300 Subject: [PATCH 3/4] Custom items 15/03 (#1925) Items being added: -Tagged brown coat - Leo Wyatt - keinto -Tagged brown hat - Leo Wyatt - keinto Also, fixing some minor issues with some custom items. --- code/modules/customitems/item_defines.dm | 33 ++++++++++++++++++----- icons/obj/custom_items/leo_coat.dmi | Bin 0 -> 2211 bytes 2 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 icons/obj/custom_items/leo_coat.dmi diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 47a336aee2d..222a4d7f77e 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -96,7 +96,7 @@ All custom items with worn sprites must follow the contained sprite system: http /obj/item/clothing/gloves/swat/fluff/hawk_gloves //Sharpshooter gloves - Hawk Silverstone - nebulaflare - name = "\improper sharpshooter gloves" + name = "sharpshooter gloves" desc = "These tactical gloves are tailor made for a marksman." icon = 'icons/obj/custom_items/hawk_gloves.dmi' icon_state = "hawk_gloves" @@ -258,6 +258,7 @@ All custom items with worn sprites must follow the contained sprite system: http name = "ATLAS poster" /obj/item/weapon/contraband/poster/fluff/conservan_poster/New() + ..() serial_number = 59 @@ -341,7 +342,7 @@ All custom items with worn sprites must follow the contained sprite system: http /obj/item/weapon/fluff/moon_baton //Tiger Claw - Zander Moon - omnivac name = "tiger claw" - desc = "A small cerimonial energy dagger given to Golden Tigers." + desc = "A small ceremonial energy dagger given to Golden Tigers." icon = 'icons/obj/custom_items/moon_baton.dmi' icon_state = "tigerclaw" item_state = "tigerclaw" @@ -467,7 +468,7 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = 1 canremove = 0 abstract = 1 - species_restricted = list("Baseline Frame") + species_restricted = list("Machine") /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/barcia_flask //First Shot - Gabriel Barcia - mrgabol100 @@ -618,7 +619,7 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = 1 -/obj/item/sign/fluff/alexis_degree //Xenonuerology Doctorate - Alexis Shaw - Tenenza +/obj/item/sign/fluff/alexis_degree //Xenonuerology Doctorate - Alexis Shaw - tenenza name = "xenonuerology degree" desc = "Certification for a doctorate in Xenonuerology, made out to Alexis Shaw by the St. Grahelm University of Biesel, authenticated by watermarking." icon_state = "alexis_degree" @@ -723,8 +724,8 @@ All custom items with worn sprites must follow the contained sprite system: http w_class = 2 -/obj/item/clothing/accessory/fluff/zahra_pin //Indigo remembrance pin - Zahra Karimi - synnono - name = "Indigo remembrance pin" +/obj/item/clothing/accessory/fluff/zahra_pin //Indigo Remembrance Pin - Zahra Karimi - synnono + name = "indigo remembrance pin" desc = "A small metal pin, worked into the likeness of an indigo iris blossom." icon = 'icons/obj/custom_items/zahra_pin.dmi' icon_state = "zahra_pin" @@ -732,7 +733,7 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = 1 -/obj/item/clothing/accessory/armband/fluff/karl_armband //Medizinercorps armband - Karl Jonson - arrow768 +/obj/item/clothing/accessory/armband/fluff/karl_armband //Medizinercorps Armband - Karl Jonson - arrow768 name = "medizinercorps armband" desc = "A plain black armband with the golden Medizinercorps logo on it." icon = 'icons/obj/custom_items/karl_armband.dmi' @@ -1008,3 +1009,21 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "ghoz_eyes" contained_sprite = 1 action_button_name = "Toggle Eyelids" + species_restricted = list("Vaurca") //i think this would make sense since those are some kind of vaurca build prothestic + + +/obj/item/clothing/head/det/fluff/leo_hat //Tagged brown hat - Leo Wyatt - keinto + name = "tagged brown hat" + desc = "A worn mid 20th century brown hat. If you look closely at the back, you can see a an embedded tag from the \"Museum of Terran Culture and Technology\"." + icon = 'icons/obj/custom_items/leo_coat.dmi' + icon_state = "leo_hat" + item_state = "leo_hat" + contained_sprite = 1 + +/obj/item/clothing/suit/storage/det_trench/fluff/leo_coat //Tagged brown coat - Leo Wyatt - keinto + name = "tagged brown coat" + desc = "A worn mid 20th century brown trenchcoat. If you look closely at bottom of the back, you can see an embedded tag from the \"Museum of Terran Culture and Technology\"." + icon = 'icons/obj/custom_items/leo_coat.dmi' + icon_state = "leo_coat" + item_state = "leo_coat" + contained_sprite = 1 diff --git a/icons/obj/custom_items/leo_coat.dmi b/icons/obj/custom_items/leo_coat.dmi new file mode 100644 index 0000000000000000000000000000000000000000..569630b8916c11e7d50ed4deb1d5628468144169 GIT binary patch literal 2211 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 literal 0 HcmV?d00001 From 66e6051bc76feb70d966be0e0870a9bdab7dac2e Mon Sep 17 00:00:00 2001 From: skull132 Date: Fri, 17 Mar 2017 17:34:57 -0400 Subject: [PATCH 4/4] Changelogs, 12MAR2017 --- html/changelog.html | 6 +++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/LordFowl - 1138.yml | 36 ----------------------------- 3 files changed, 9 insertions(+), 36 deletions(-) delete mode 100644 html/changelogs/LordFowl - 1138.yml diff --git a/html/changelog.html b/html/changelog.html index 229d3be6c82..3276aed72e8 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

14 March 2017

+

LordFowl updated:

+
    +
  • Fixed chest-buzzers in Vaurca.
    • +
+

05 March 2017

Skull132 updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index aef15ce5db7..08c97b066c5 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -3791,3 +3791,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Skull132: - bugfix: Internal organ repair surgery for mechanical organs now works properly again. +2017-03-14: + LordFowl: + - bugfix: Fixed chest-buzzers in Vaurca. diff --git a/html/changelogs/LordFowl - 1138.yml b/html/changelogs/LordFowl - 1138.yml deleted file mode 100644 index 88ce238d484..00000000000 --- a/html/changelogs/LordFowl - 1138.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: LordFowl - -# 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: "Fixed chest-buzzers in Vaurca."