diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm
index 2d8bb8a36a1..dd00c02151b 100644
--- a/code/game/objects/items/weapons/candle.dm
+++ b/code/game/objects/items/weapons/candle.dm
@@ -1,6 +1,6 @@
/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"
@@ -8,6 +8,11 @@
var/wax = 2000
+/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 > 1500)
@@ -80,4 +85,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/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/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm
index 2545cfc01cf..a4f91ce94c3 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
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 1a9ae03d513..63b781e1833 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -10,6 +10,10 @@
sleep(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)
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 5e0aee6cb0f..758ff353bc7 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_PAPER_MESSAGE_LEN
stamped = list()
overlays.Cut()
updateinfolinks()
@@ -327,12 +336,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 << "There isn't enough space left on \the [src] to write anything."
return
- var/t = sanitize(input("Enter what you want to write:", "Write", null, null) as message, textlimit, extra = 0)
+ var/t = strip_html_simple(input("Enter what you want to write:", "Write", null, null) as message)
if(!t)
return
@@ -378,6 +386,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()
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index acf243fc99d..ea390427ce4 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
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."
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