From 53a95d8effcbefa3ec3d654ead7d727d5397ca2a Mon Sep 17 00:00:00 2001 From: volas Date: Mon, 20 Apr 2015 23:09:24 +0300 Subject: [PATCH 1/7] Fixes #8913 --- code/modules/paperwork/paper.dm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 6c91d2de032..29c1dbcd57a 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -22,6 +22,7 @@ var/info_links //A different version of the paper which includes html links at fields and EOF var/stamps //The (text for the) stamps on the paper. var/fields //Amount of user created fields + var/free_space = MAX_PAPER_MESSAGE_LEN var/list/stamped var/list/ico[0] //Icons and var/list/offset_x[0] //offsets stored for later @@ -51,6 +52,7 @@ spawn(2) update_icon() + update_space(info) updateinfolinks() return @@ -62,6 +64,12 @@ return icon_state = "paper" +/obj/item/weapon/paper/proc/update_space(var/new_text) + if(!new_text) + return + + free_space -= length(strip_html_properly(new_text, 0)) + /obj/item/weapon/paper/examine(mob/user) ..() if(in_range(user, src) || istype(user, /mob/dead/observer)) @@ -188,6 +196,7 @@ /obj/item/weapon/paper/proc/clearpaper() info = null stamps = null + free_space = MAX_BOOK_MESSAGE_LEN stamped = list() overlays.Cut() updateinfolinks() @@ -325,12 +334,11 @@ var/id = href_list["write"] //var/t = strip_html_simple(input(usr, "What text do you wish to add to " + (id=="end" ? "the end of the paper" : "field "+id) + "?", "[name]", null),8192) as message - var/textlimit = MAX_PAPER_MESSAGE_LEN - length(info) - if(textlimit <= 0) + if(free_space <= 0) usr << "You're trying to find a free place on paper, but can't!" return - var/t = strip_html_simple(input("Enter what you want to write:", "Write", null, null) as message, textlimit) + var/t = strip_html_simple(input("Enter what you want to write:", "Write", null, null) as message, free_space) if(!t) return @@ -375,6 +383,8 @@ info += t // Oh, he wants to edit to the end of the file, let him. updateinfolinks() + update_space(t) + usr << browse("[name][info_links][stamps]", "window=[name]") // Update the window update_icon() From 89a72fb326b14762f1cf6112bcf9f34f8773da21 Mon Sep 17 00:00:00 2001 From: RavingManiac Date: Mon, 27 Apr 2015 12:10:54 +1000 Subject: [PATCH 2/7] Candle burn time increased to ~30 minutes Some fluff added to candle description explaining how they burn in space --- code/game/objects/items/weapons/candle.dm | 16 +++++++++++----- html/changelogs/RavingManiac-master.yml | 5 +++++ 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/RavingManiac-master.yml diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm index 593e85efdd3..03f060f1551 100644 --- a/code/game/objects/items/weapons/candle.dm +++ b/code/game/objects/items/weapons/candle.dm @@ -1,18 +1,24 @@ /obj/item/weapon/flame/candle name = "red candle" - desc = "a candle" + desc = "a small pillar candle. Its specially-formulated fuel-oxidizer wax mixture allows continued combustion in airless environments." icon = 'icons/obj/candle.dmi' icon_state = "candle1" item_state = "candle1" w_class = 1 - var/wax = 200 + var/wax = 0 + var/starting_wax = 0 + +/obj/item/weapon/flame/candle/New() + wax = rand(800, 1000) // Enough for 27-33 minutes. 30 minutes on average. + starting_wax = wax + ..() /obj/item/weapon/flame/candle/update_icon() var/i - if(wax>150) + if(wax > starting_wax*3/4) i = 1 - else if(wax>80) + else if(wax > starting_wax*2/5) i = 2 else i = 3 icon_state = "candle[i][lit ? "_lit" : ""]" @@ -80,4 +86,4 @@ /obj/item/weapon/flame/candle/dropped(mob/user) if(lit) user.SetLuminosity(user.luminosity - CANDLE_LUM) - SetLuminosity(CANDLE_LUM) + SetLuminosity(CANDLE_LUM) \ No newline at end of file diff --git a/html/changelogs/RavingManiac-master.yml b/html/changelogs/RavingManiac-master.yml new file mode 100644 index 00000000000..9d3ea70147b --- /dev/null +++ b/html/changelogs/RavingManiac-master.yml @@ -0,0 +1,5 @@ +author: RavingManiac +delete-after: True + +changes: + - tweak: "Candles now burn for about 30 mintutes." From 159ad76fab4fcbb791867ef32e689599ca2fb058 Mon Sep 17 00:00:00 2001 From: Kelenius Date: Mon, 27 Apr 2015 08:06:21 +0300 Subject: [PATCH 3/7] Fixes #8998 --- code/modules/hydroponics/seed_storage.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index 469896018e8..e64ad1e8131 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -231,12 +231,15 @@ S.remove_from_storage(O, src) O.loc = src + var/newID = 0 for (var/datum/seed_pile/N in piles) if (N.matches(O)) ++N.amount N.seeds += (O) return + else if(N.ID >= newID) + newID = N.ID + 1 - piles += new /datum/seed_pile(O, piles.len) + piles += new /datum/seed_pile(O, newID) return From aa115f5bb217247284945f13221eae9d8f8fb2f9 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Mon, 27 Apr 2015 16:41:47 +0100 Subject: [PATCH 4/7] Fixes antag surgery kit --- code/game/objects/items/weapons/storage/firstaid.dm | 4 ++++ html/changelogs/Yoshax-ICanIntoSurgery.YML | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 html/changelogs/Yoshax-ICanIntoSurgery.YML diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 304c59fb982..7b2c03ba4a3 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -131,6 +131,7 @@ /obj/item/weapon/storage/firstaid/surgery name = "surgery kit" desc = "Contains tools for surgery." + storage_slots = 10 /obj/item/weapon/storage/firstaid/surgery/New() ..() @@ -142,6 +143,9 @@ new /obj/item/weapon/retractor(src) new /obj/item/weapon/scalpel(src) new /obj/item/weapon/surgicaldrill(src) + new /obj/item/weapon/bonegel(src) + new /obj/item/weapon/FixOVein(src) + new /obj/item/stack/medical/advanced/bruise_pack(src) return /* diff --git a/html/changelogs/Yoshax-ICanIntoSurgery.YML b/html/changelogs/Yoshax-ICanIntoSurgery.YML new file mode 100644 index 00000000000..9aa57af213f --- /dev/null +++ b/html/changelogs/Yoshax-ICanIntoSurgery.YML @@ -0,0 +1,5 @@ +author: Yoshax +delete-after: True + +changes: + - tweak: "Adds items to the orderable antag surgical kit so its actually useful for surgery." \ No newline at end of file From d0615430ecad37db85c0e360265a465bec9f8406 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 27 Apr 2015 01:25:45 -0400 Subject: [PATCH 5/7] Fixes #8997 Gibbing a human now causes all items on or in their person to get thrown around. This includes implants and bullet shrapnel. --- code/modules/mob/living/carbon/human/death.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 466742046bb..5a439731975 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -15,6 +15,10 @@ // Override the current limb status and don't cause an explosion E.droplimb(1,1) + for(var/obj/item/I in src) + drop_from_inventory(I) + I.throw_at(get_edge_target_turf(src,pick(alldirs)), rand(1,3), round(30/I.w_class)) + ..(species.gibbed_anim) gibs(loc, viruses, dna, null, species.flesh_color, species.blood_color) From 36d9944dfd5a7f00f40281fbb8812ac29b0b63a5 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 27 Apr 2015 01:49:18 -0400 Subject: [PATCH 6/7] Fixes #8977 --- code/modules/power/lighting.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 7c9ae41cf25..d513d2ff120 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -9,7 +9,7 @@ #define LIGHT_BROKEN 2 #define LIGHT_BURNED 3 - +#define LIGHT_BULB_TEMPERATURE 400 //K - used value for a 60W bulb /obj/item/light_fixture_frame name = "light fixture frame" @@ -487,11 +487,13 @@ var/mob/living/carbon/human/H = user if(istype(H)) - - if(H.gloves) + if(H.species.heat_level_1 > LIGHT_BULB_TEMPERATURE) + prot = 1 + else if(H.gloves) var/obj/item/clothing/gloves/G = H.gloves if(G.max_heat_protection_temperature) - prot = (G.max_heat_protection_temperature > 360) + if(G.max_heat_protection_temperature > LIGHT_BULB_TEMPERATURE) + prot = 1 else prot = 1 From 59e17f7a9b7f47880d4b8c18a05692f7035c2ce9 Mon Sep 17 00:00:00 2001 From: volas Date: Tue, 28 Apr 2015 00:41:14 +0300 Subject: [PATCH 7/7] small fix --- code/modules/paperwork/paper.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 29c1dbcd57a..87d5f002eeb 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -196,7 +196,7 @@ /obj/item/weapon/paper/proc/clearpaper() info = null stamps = null - free_space = MAX_BOOK_MESSAGE_LEN + free_space = MAX_PAPER_MESSAGE_LEN stamped = list() overlays.Cut() updateinfolinks()