diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm
index 2d8bb8a36a1..9bbdd1380dc 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,10 @@
var/wax = 2000
+/obj/item/weapon/flame/candle/New()
+ wax = rand(800, 1000) // Enough for 27-33 minutes. 30 minutes on average.
+ ..()
+
/obj/item/weapon/flame/candle/update_icon()
var/i
if(wax > 1500)
@@ -80,4 +84,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..31cb465923c 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_properly(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/changelog.html b/html/changelog.html
index 308ecb672e2..d83bfdb3d17 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,52 @@
-->
+
28 April 2015
+
Jarcolr updated:
+
+ - Added 9 new bar sign designs/sprites.
+
+
Kelenius updated:
+
+ - Good news to the roboticists! The long waited firmware update for the bots has arrived. You can expect the following changes:
+ - Medbots have improved the disease detection algorithms.
+ - Floorbot firmware has been bugtested. In particular, they will no longer get stuck near the windows, hopelessly trying to fix the floor under the glass.
+ - Floorbots have also received an internal low-power metal synthesizer. They will use it to make their own tiles. Slowly.
+ - Following the complains from humanitarian organizations regarding securitron brutality, stength of their stunners has been toned down. They will also politely demand that you get on the floor before arresting you. Except for the taser-mounted guys, they will still tase you down.
+ - Other minor fixes.
+ - The lasertag bots are now forbidden to build and use following the incident #1526672. Please don't let it happen again.
+ - The farmbot design has been finished! Made from a watertank, robot arm, plant analyzer, bucket, minihoe and a proximity sensor, these small (not really) bots will be a useful companion to any gardener and/or xenobotanist.
+ - Spider learning alert: they have learned to recognize the bots and will mercilessly attack them.
+ - An experimental CPU upgrade would theoretically allow any of the bots to function with the same intelligence capacity as the maintenance drones. We still have no idea what causes it to boot up. Science!
+ - INCOMING TRANSMISSION: Greetings to agents, pirates, operatives, and anyone who otherwise uses our equipment. Following the NT update of bot firmware, we have updated the cryptographic sequencer's hacking routines as well. The medbots you emag will not poison you anymore, the clanbots won't clean after themselves immediately, and floorbots... wear a space suit. Oh, and it works on the new farmbots, too.
+
+
PsiOmegaDelta updated:
+
+ - Beware. Airlocks can now crush more things than just mobs.
+ - AIs now have a personal atmospherics control subsystem.
+ - Some borg modules now have additional subsystems.
+ - Improves borg module handling.
+ - Secure airlocks now buzz when access is denied.
+ - The mental health office door now requires psychiatrist access, and the related button now opens/closes the door instead of bolting.
+ - Restores an old soundtrack 'Thunderdome.ogg'.
+ - Some holodeck programs now have custom ambience tracks.
+
+
RavingManiac updated:
+
+ - The phoron research lab has been renovated to include a heat-exchange system, a gas mixer/filter and a waste gas disposal pump.
+ - Candles now burn for about 30 mintutes.
+
+
Yoshax updated:
+
+ - Adds items to the orderable antag surgical kit so its actually useful for surgery.
+ - Adjusts custom loadout costs to be more standardised and balances. Purely cosmetic items, shoes, hats, and all things that do not provide a straight advtange (sterile mask, or pAI, protection from viruses and possible door hacking or records access, respectively), each cost 1 point, items that provide an advantage like those just mentioned, or provide armor or storage cost 2 points.
+ - Adds practice rounds, both .45 for Sec and Detective's guns, also 9mm top mounted for the Saber, and for the Bulldog.
+ - Adds the .45 and 9mm practice rounds to the armory.
+ - Adds all the practice rounds to the autolathe.
+ - Adds r_walls to the back of the firing range, leaves the sides normal.
+ - Fixes HoS' office door to not be CMO locked.
+
+
24 April 2015
Dennok updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index b1f2b697f97..dcdffbe25ec 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1608,3 +1608,63 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- bugfix: Fixes overmap ship speed calculations.
- rscadd: Adds overmap ship rotation.
- rscadd: Added a floorlayer.
+2015-04-28:
+ Jarcolr:
+ - rscadd: Added 9 new bar sign designs/sprites.
+ Kelenius:
+ - rscadd: 'Good news to the roboticists! The long waited firmware update for the
+ bots has arrived. You can expect the following changes:'
+ - rscadd: Medbots have improved the disease detection algorithms.
+ - rscadd: Floorbot firmware has been bugtested. In particular, they will no longer
+ get stuck near the windows, hopelessly trying to fix the floor under the glass.
+ - rscadd: Floorbots have also received an internal low-power metal synthesizer.
+ They will use it to make their own tiles. Slowly.
+ - rscadd: Following the complains from humanitarian organizations regarding securitron
+ brutality, stength of their stunners has been toned down. They will also politely
+ demand that you get on the floor before arresting you. Except for the taser-mounted
+ guys, they will still tase you down.
+ - rscadd: Other minor fixes.
+ - rscdel: 'The lasertag bots are now forbidden to build and use following the incident
+ #1526672. Please don''t let it happen again.'
+ - rscadd: The farmbot design has been finished! Made from a watertank, robot arm,
+ plant analyzer, bucket, minihoe and a proximity sensor, these small (not really)
+ bots will be a useful companion to any gardener and/or xenobotanist.
+ - tweak: 'Spider learning alert: they have learned to recognize the bots and will
+ mercilessly attack them.'
+ - rscadd: An experimental CPU upgrade would theoretically allow any of the bots
+ to function with the same intelligence capacity as the maintenance drones. We
+ still have no idea what causes it to boot up. Science!
+ - rscadd: 'INCOMING TRANSMISSION: Greetings to agents, pirates, operatives, and
+ anyone who otherwise uses our equipment. Following the NT update of bot firmware,
+ we have updated the cryptographic sequencer''s hacking routines as well. The
+ medbots you emag will not poison you anymore, the clanbots won''t clean after
+ themselves immediately, and floorbots... wear a space suit. Oh, and it works
+ on the new farmbots, too.'
+ PsiOmegaDelta:
+ - rscadd: Beware. Airlocks can now crush more things than just mobs.
+ - rscadd: AIs now have a personal atmospherics control subsystem.
+ - rscadd: Some borg modules now have additional subsystems.
+ - tweak: Improves borg module handling.
+ - tweak: Secure airlocks now buzz when access is denied.
+ - tweak: The mental health office door now requires psychiatrist access, and the
+ related button now opens/closes the door instead of bolting.
+ - soundadd: Restores an old soundtrack 'Thunderdome.ogg'.
+ - rscadd: Some holodeck programs now have custom ambience tracks.
+ RavingManiac:
+ - rscadd: The phoron research lab has been renovated to include a heat-exchange
+ system, a gas mixer/filter and a waste gas disposal pump.
+ - tweak: Candles now burn for about 30 mintutes.
+ Yoshax:
+ - tweak: Adds items to the orderable antag surgical kit so its actually useful for
+ surgery.
+ - tweak: Adjusts custom loadout costs to be more standardised and balances. Purely
+ cosmetic items, shoes, hats, and all things that do not provide a straight advtange
+ (sterile mask, or pAI, protection from viruses and possible door hacking or
+ records access, respectively), each cost 1 point, items that provide an advantage
+ like those just mentioned, or provide armor or storage cost 2 points.
+ - rscadd: Adds practice rounds, both .45 for Sec and Detective's guns, also 9mm
+ top mounted for the Saber, and for the Bulldog.
+ - rscadd: Adds the .45 and 9mm practice rounds to the armory.
+ - rscadd: Adds all the practice rounds to the autolathe.
+ - tweak: Adds r_walls to the back of the firing range, leaves the sides normal.
+ - bugfix: Fixes HoS' office door to not be CMO locked.
diff --git a/html/changelogs/Jarcolr-PR-8968.yml b/html/changelogs/Jarcolr-PR-8968.yml
deleted file mode 100644
index dd95d001b29..00000000000
--- a/html/changelogs/Jarcolr-PR-8968.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Jarcolr
-
-delete-after: True
-
-changes:
- - rscadd: "Added 9 new bar sign designs/sprites."
\ No newline at end of file
diff --git a/html/changelogs/PsiOmegaDelta-AirlockPressure.yml b/html/changelogs/PsiOmegaDelta-AirlockPressure.yml
deleted file mode 100644
index 0f64ac3bd28..00000000000
--- a/html/changelogs/PsiOmegaDelta-AirlockPressure.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: PsiOmegaDelta
-changes:
- - rscadd: "Beware. Airlocks can now crush more things than just mobs."
-delete-after: True
diff --git a/html/changelogs/PsiOmegaDelta-PR-8905.yml b/html/changelogs/PsiOmegaDelta-PR-8905.yml
deleted file mode 100644
index b984448b321..00000000000
--- a/html/changelogs/PsiOmegaDelta-PR-8905.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: PsiOmegaDelta
-delete-after: True
-changes:
- - rscadd: "AIs now have a personal atmospherics control subsystem."
- - rscadd: "Some borg modules now have additional subsystems."
- - tweak: "Improves borg module handling."
diff --git a/html/changelogs/PsiOmegaDelta-PR-8996.yml b/html/changelogs/PsiOmegaDelta-PR-8996.yml
deleted file mode 100644
index f2b71c05903..00000000000
--- a/html/changelogs/PsiOmegaDelta-PR-8996.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: PsiOmegaDelta
-delete-after: True
-changes:
- - tweak: "Secure airlocks now buzz when access is denied."
diff --git a/html/changelogs/PsiOmegaDelta.yml b/html/changelogs/PsiOmegaDelta.yml
index 20e7f6d2c33..6fdea55f549 100644
--- a/html/changelogs/PsiOmegaDelta.yml
+++ b/html/changelogs/PsiOmegaDelta.yml
@@ -1,6 +1,3 @@
author: PsiOmegaDelta
-changes:
- - tweak: "The mental health office door now requires psychiatrist access, and the related button now opens/closes the door instead of bolting."
- - soundadd: "Restores an old soundtrack 'Thunderdome.ogg'."
- - rscadd: "Some holodeck programs now have custom ambience tracks."
+changes: []
delete-after: false
diff --git a/html/changelogs/RavingManiac-dev-2.yml b/html/changelogs/RavingManiac-dev-2.yml
deleted file mode 100644
index ea89ad99239..00000000000
--- a/html/changelogs/RavingManiac-dev-2.yml
+++ /dev/null
@@ -1,35 +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
-# spellcheck (typo fixes)
-# experiment
-#################################
-
-# Your name.
-author: RavingManiac
-
-# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit.
-# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes:
- - rscadd: "The phoron research lab has been renovated to include a heat-exchange system, a gas mixer/filter and a waste gas disposal pump."
diff --git a/html/changelogs/Yoshax-LoadoutPoints.YML b/html/changelogs/Yoshax-LoadoutPoints.YML
deleted file mode 100644
index 051e156a2d9..00000000000
--- a/html/changelogs/Yoshax-LoadoutPoints.YML
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Yoshax
-delete-after: True
-
-changes:
- - tweak: "Adjusts custom loadout costs to be more standardised and balances. Purely cosmetic items, shoes, hats, and all things that do not provide a straight advtange (sterile mask, or pAI, protection from viruses and possible door hacking or records access, respectively), each cost 1 point, items that provide an advantage like those just mentioned, or provide armor or storage cost 2 points."
\ No newline at end of file
diff --git a/html/changelogs/Yoshax-MoreFunPracticeShoot.YML b/html/changelogs/Yoshax-MoreFunPracticeShoot.YML
deleted file mode 100644
index 0ee6e602593..00000000000
--- a/html/changelogs/Yoshax-MoreFunPracticeShoot.YML
+++ /dev/null
@@ -1,8 +0,0 @@
-author: Yoshax
-delete-after: True
-
-changes:
- - rscadd: "Adds practice rounds, both .45 for Sec and Detective's guns, also 9mm top mounted for the Saber, and for the Bulldog
- - rscadd: "Adds the .45 and 9mm practice rounds to the armory."
- - rscadd: "Adds all the practice rounds to the autolathe."
- - tweak: "Adds r_walls to the back of the firing range, leaves the sides normal."
diff --git a/html/changelogs/Yoshax-OpenPls.YML b/html/changelogs/Yoshax-OpenPls.YML
deleted file mode 100644
index eb85bc81d80..00000000000
--- a/html/changelogs/Yoshax-OpenPls.YML
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Yoshax
-delete-after: True
-
-changes:
- - bugfix: "Fixes HoS' office door to not be CMO locked."
diff --git a/html/changelogs/kelenius-PR-8991.yml b/html/changelogs/kelenius-PR-8991.yml
deleted file mode 100644
index f85183c2401..00000000000
--- a/html/changelogs/kelenius-PR-8991.yml
+++ /dev/null
@@ -1,40 +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
-# spellcheck (typo fixes)
-# experiment
-#################################
-
-# Your name.
-author: Kelenius
-
-# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
-delete-after: True
-
-changes:
- - rscadd: "Good news to the roboticists! The long waited firmware update for the bots has arrived. You can expect the following changes:"
- - rscadd: "Medbots have improved the disease detection algorithms."
- - rscadd: "Floorbot firmware has been bugtested. In particular, they will no longer get stuck near the windows, hopelessly trying to fix the floor under the glass."
- - rscadd: "Floorbots have also received an internal low-power metal synthesizer. They will use it to make their own tiles. Slowly."
- - rscadd: "Following the complains from humanitarian organizations regarding securitron brutality, stength of their stunners has been toned down. They will also politely demand that you get on the floor before arresting you. Except for the taser-mounted guys, they will still tase you down."
- - rscadd: "Other minor fixes."
- - rscdel: "The lasertag bots are now forbidden to build and use following the incident #1526672. Please don't let it happen again."
- - scaadd: "The farmbot design has been finished! Made from a watertank, robot arm, plant analyzer, bucket, minihoe and a proximity sensor, these small (not really) bots will be a useful companion to any gardener and/or xenobotanist."
- - tweak: "Spider learning alert: they have learned to recognize the bots and will mercilessly attack them."
- - scadd: "An experimental CPU upgrade would theoretically allow any of the bots to function with the same intelligence capacity as the maintenance drones. We still have no idea what causes it to boot up. Science!"
- - scadd: "INCOMING TRANSMISSION: Greetings to agents, pirates, operatives, and anyone who otherwise uses our equipment. Following the NT update of bot firmware, we have updated the cryptographic sequencer's hacking routines as well. The medbots you emag will not poison you anymore, the clanbots won't clean after themselves immediately, and floorbots... wear a space suit. Oh, and it works on the new farmbots, too."