Merge pull request #9016 from PsiOmegaDelta/dev

Dev
This commit is contained in:
PsiOmegaDelta
2015-04-28 09:14:37 +02:00
18 changed files with 144 additions and 127 deletions
+6 -2
View File
@@ -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)
@@ -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
/*
+4 -1
View File
@@ -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
@@ -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)
+13 -3
View File
@@ -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 << "<span class='info'>There isn't enough space left on \the [src] to write anything.</span>"
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("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info_links][stamps]</BODY></HTML>", "window=[name]") // Update the window
update_icon()
+6 -4
View File
@@ -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
+46
View File
@@ -56,6 +56,52 @@
-->
<div class="commit sansserif">
<h2 class="date">28 April 2015</h2>
<h3 class="author">Jarcolr updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Added 9 new bar sign designs/sprites.</li>
</ul>
<h3 class="author">Kelenius updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Good news to the roboticists! The long waited firmware update for the bots has arrived. You can expect the following changes:</li>
<li class="rscadd">Medbots have improved the disease detection algorithms.</li>
<li class="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.</li>
<li class="rscadd">Floorbots have also received an internal low-power metal synthesizer. They will use it to make their own tiles. Slowly.</li>
<li class="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.</li>
<li class="rscadd">Other minor fixes.</li>
<li class="rscdel">The lasertag bots are now forbidden to build and use following the incident #1526672. Please don't let it happen again.</li>
<li class="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.</li>
<li class="tweak">Spider learning alert: they have learned to recognize the bots and will mercilessly attack them.</li>
<li class="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!</li>
<li class="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.</li>
</ul>
<h3 class="author">PsiOmegaDelta updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Beware. Airlocks can now crush more things than just mobs.</li>
<li class="rscadd">AIs now have a personal atmospherics control subsystem.</li>
<li class="rscadd">Some borg modules now have additional subsystems.</li>
<li class="tweak">Improves borg module handling.</li>
<li class="tweak">Secure airlocks now buzz when access is denied.</li>
<li class="tweak">The mental health office door now requires psychiatrist access, and the related button now opens/closes the door instead of bolting.</li>
<li class="soundadd">Restores an old soundtrack 'Thunderdome.ogg'.</li>
<li class="rscadd">Some holodeck programs now have custom ambience tracks.</li>
</ul>
<h3 class="author">RavingManiac updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">The phoron research lab has been renovated to include a heat-exchange system, a gas mixer/filter and a waste gas disposal pump.</li>
<li class="tweak">Candles now burn for about 30 mintutes.</li>
</ul>
<h3 class="author">Yoshax updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Adds items to the orderable antag surgical kit so its actually useful for surgery.</li>
<li class="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.</li>
<li class="rscadd">Adds practice rounds, both .45 for Sec and Detective's guns, also 9mm top mounted for the Saber, and for the Bulldog.</li>
<li class="rscadd">Adds the .45 and 9mm practice rounds to the armory.</li>
<li class="rscadd">Adds all the practice rounds to the autolathe.</li>
<li class="tweak">Adds r_walls to the back of the firing range, leaves the sides normal.</li>
<li class="bugfix">Fixes HoS' office door to not be CMO locked.</li>
</ul>
<h2 class="date">24 April 2015</h2>
<h3 class="author">Dennok updated:</h3>
<ul class="changes bgimages16">
+60
View File
@@ -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.
-6
View File
@@ -1,6 +0,0 @@
author: Jarcolr
delete-after: True
changes:
- rscadd: "Added 9 new bar sign designs/sprites."
@@ -1,4 +0,0 @@
author: PsiOmegaDelta
changes:
- rscadd: "Beware. Airlocks can now crush more things than just mobs."
delete-after: True
@@ -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."
@@ -1,4 +0,0 @@
author: PsiOmegaDelta
delete-after: True
changes:
- tweak: "Secure airlocks now buzz when access is denied."
+1 -4
View File
@@ -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
-35
View File
@@ -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."
-5
View File
@@ -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."
@@ -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."
-5
View File
@@ -1,5 +0,0 @@
author: Yoshax
delete-after: True
changes:
- bugfix: "Fixes HoS' office door to not be CMO locked."
-40
View File
@@ -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."