Merge remote-tracking branch 'origin/master' into development

This commit is contained in:
skull132
2016-06-22 10:56:26 -04:00
27 changed files with 250 additions and 439 deletions
-37
View File
@@ -1,37 +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: Nanako
# 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: "Sterilizine will now clean wounds, to reduce and prevent infection"
- tweak: "Spraybottles now display a message when sprayed on any mob"
-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
# maptweak
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: Nanako
# 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:
- tweak: "Proteins now restore blood twice as effectively"
- rscadd: "Unathi will no longer digest nutriment, only proteins"
- rscadd: "Added seafood protein. Space-carp fillets, and all recipes made with them, now contain seafood protein instead of animal protein"
- rscadd: "Skrell are able to safely digest seafood protein"
- tweak: "Unathi are now immune to Carpotoxin"
-39
View File
@@ -1,39 +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: Nanako
# 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:
- tweak: "Mobs breathing a poisonous gas now get that chemical added to their bloodstream, instead of generic 'toxin'."
- tweak: "Air alarms now properly say phoron instead of toxin"
- tweak: "Engine cooling computers now identify phoron as Ph instead of Tx"
-36
View File
@@ -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: Nanako
# 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: "Passengers can now be removed from exosuit passenger compartments via the maintenance panel"
-44
View File
@@ -1,44 +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: Nanako
# 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:
- rscadd: "Added a new Chemistry Gripper for cyborgs. It holds beakers, bottles, pills, pillbottles, spraybottles, labellers, and phoron sheets"
- bugfix: "Removed Large Beaker from crisis and research cyborgs, replaced with chemistry gripper"
- bugfix: "Cyborgs can now interact with reagent grinders"
- rscadd: "Cyborgs can now place objects in their gripper, on a table"
- rscadd: "Cyborgs can now place objects from their gripper into a disposal bin"
- rscadd: "Cyborgs can now use a gripper to take valid objects out of cardboard boxes"
- tweak: "Cyborgs can now use their other tools, on things held in their gripper"
- tweak: "Using an empty gripper on a machine now interacts with it"
- tweak: "Cyborgs can now use items held in their gripper on rechargers"
-37
View File
@@ -1,37 +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: Nanako
# 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 the mutation chance on unstable mutagen. It was 1% of what it should have been"
- rscadd: "Added a little RP message when unstable mutagen does its thing"
-39
View File
@@ -1,39 +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: Nanako
# 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: "Sleepers will no longer eject their dialysis beaker and bug out when you eject a patient"
- bugfix: "Fixed a bug with medical machines where a patient could be duplicated"
- rscadd: "The dialysis beaker can now be checked and removed while a sleeper has no occupant"
-37
View File
@@ -1,37 +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: Nanako
# 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:
- rscadd: "Male unathi can now break handcuffs."
-38
View File
@@ -1,38 +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: Nanako
# 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: "Tajarans can now wear tajaran-specific gloves"
- bugfix: "Tajaran wardens, detectives and heads of security will properly spawn wearing black tajara gloves"
+14 -14
View File
@@ -56,6 +56,20 @@ CREATE TABLE `ss13_ban_mirrors` (
PRIMARY KEY (`ban_mirror_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `ss13_player` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`ckey` varchar(32) CHARACTER SET latin1 NOT NULL,
`firstseen` datetime NOT NULL,
`lastseen` datetime NOT NULL,
`ip` varchar(18) CHARACTER SET latin1 NOT NULL,
`computerid` varchar(32) CHARACTER SET latin1 NOT NULL,
`lastadminrank` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT 'Player',
`whitelist_status` int(11) unsigned NOT NULL DEFAULT '0',
`migration_status` tinyint(1) DEFAULT '0',
PRIMARY KEY (`id`),
UNIQUE KEY `ckey` (`ckey`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `ss13_characters` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`ckey` varchar(32) NOT NULL,
@@ -237,20 +251,6 @@ CREATE TABLE `ss13_notes` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `ss13_player` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`ckey` varchar(32) CHARACTER SET latin1 NOT NULL,
`firstseen` datetime NOT NULL,
`lastseen` datetime NOT NULL,
`ip` varchar(18) CHARACTER SET latin1 NOT NULL,
`computerid` varchar(32) CHARACTER SET latin1 NOT NULL,
`lastadminrank` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT 'Player',
`whitelist_status` int(11) unsigned NOT NULL DEFAULT '0',
`migration_status` tinyint(1) DEFAULT '0',
PRIMARY KEY (`id`),
UNIQUE KEY `ckey` (`ckey`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `ss13_player_linking` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`forum_id` int(11) NOT NULL,
+1 -2
View File
@@ -389,8 +389,7 @@ datum/projectile_data
var/h = 10
var/power_x = power * cos(angle)
var/power_y = power * sin(angle)
// var/time = 2* power_y / 10 //10 = g
var/time = (power_x + sqrt((power_x*power_x)+(2*g*h)))/g
var/time = (power_y + sqrt((power_y*power_y)+(2*g*h)))/g
var/distance = time * power_x
var/dest_x = src_x + distance*sin(rotation);
+1
View File
@@ -18,6 +18,7 @@
/datum/game_mode/nuclear/declare_completion()
if(config.objectives_disabled)
..()
return
var/disk_rescued = 1
for(var/obj/item/weapon/disk/nuclear/D in world)
+30 -3
View File
@@ -345,13 +345,17 @@
set name = "Toggle Veil Walking (80)"
set desc = "You enter the veil, leaving only an incorporeal manifestation of you visible to the others."
var/datum/vampire/vampire = vampire_power(80, 0, 1)
var/datum/vampire/vampire = vampire_power(0, 0, 1)
if (!vampire)
return
if (vampire.holder)
vampire.holder.deactivate()
else
vampire = vampire_power(80, 0, 1)
if (!vampire)
return
var/obj/effect/dummy/veil_walk/holder = new /obj/effect/dummy/veil_walk(get_turf(loc))
holder.activate(src)
@@ -409,6 +413,18 @@
can_move = 1
/obj/effect/dummy/veil_walk/process()
if (owner_mob.stat)
if (owner_mob.stat == 1)
owner_mob << "<span class='warning'>You cannot maintain this form while unconcious.</span>"
spawn(10)
if (owner_mob.stat == 1)
owner_mob << "<span class='danger'>You are ejected from the Veil.</span>"
deactivate()
return
else
deactivate()
return
if (owner_vampire.blood_usable >= 5)
owner_vampire.blood_usable -= 5
@@ -485,7 +501,7 @@
set name = "Blood Heal"
set desc = "At the cost of blood and time, heal any injuries you have sustained."
var/datum/vampire/vampire = vampire_power(15, 0)
var/datum/vampire/vampire = vampire_power(0, 0)
if (!vampire)
return
@@ -493,6 +509,9 @@
if (vampire.status & VAMP_HEALING)
vampire.status &= ~VAMP_HEALING
return
else if (vampire.blood_usable < 15)
src << "<span class='warning'>You do not have enough usable blood. 15 needed.</span>"
return
vampire.status |= VAMP_HEALING
src << "<span class='notice'>You begin the process of blood healing. Do not move, and ensure that you are not interrupted.</span>"
@@ -720,7 +739,7 @@
set name = "Presence (10)"
set desc = "Influences those weak of mind to look at you in a friendlier light."
var/datum/vampire/vampire = vampire_power(15, 0)
var/datum/vampire/vampire = vampire_power(0, 0)
if (!vampire)
return
@@ -728,6 +747,9 @@
vampire.status &= ~VAMP_PRESENCE
src << "<span class='warning'>You are no longer influencing those weak of mind.</span>"
return
else if (vampire.blood_usable < 15)
src << "<span class='warning'>You do not have enough usable blood. 15 needed.</span>"
return
src << "<span class='notice'>You begin passively influencing the weak minded.</span>"
vampire.status |= VAMP_PRESENCE
@@ -747,6 +769,11 @@
// Run every 20 seconds
sleep(200)
if (stat)
src << "<span class='warning'>You cannot influence people around you while [stat == 1 ? "unconcious" : "dead"].</span>"
vampire.status &= ~VAMP_PRESENCE
break
for (var/mob/living/carbon/human/T in view(5))
if (T == src)
continue
+1 -1
View File
@@ -4,7 +4,7 @@
name = "employment records console"
desc = "Used to view, edit and maintain employment records."
icon_state = "medlaptop"
light_color = "#00b000"
light_color = "#315ab4"
req_one_access = list(access_heads)
circuit = "/obj/item/weapon/circuitboard/skills"
var/obj/item/weapon/card/id/scan = null
+19
View File
@@ -10,6 +10,25 @@
var/max_fire_temperature_sustained = 0 //The max temperature of the fire which it was subjected to
var/dirt = 0
// possible fix for the perma wet floor bug
/turf/simulated/proc/wet_floor(var/wet_val = 1)
spawn(0)
if(wet_val <= wet)
return
wet = wet_val
if(wet_overlay)
overlays -= wet_overlay
wet_overlay = null
wet_overlay = image('icons/effects/water.dmi',src,"wet_floor")
overlays += wet_overlay
sleep(800)
if(wet >= 2)
return
wet = 0
if(wet_overlay)
overlays -= wet_overlay
wet_overlay = null
/turf/simulated/clean_blood()
for(var/obj/effect/decal/cleanable/blood/B in contents)
B.clean_blood()
@@ -54,8 +54,8 @@
for (var/slot in character_slots)
load_character(slot)
if (!skills || !skills.len)
ZeroSkills(1)
// if (!skills || !skills.len)
// ZeroSkills(1)
if (!insert_character_sql(C))
log_debug("Character insert error during migration. Client: [C.ckey], character slot: [slot].")
+22 -2
View File
@@ -283,6 +283,11 @@
// Miscellaneous
disabilities = text2num(character_query.item[48])
skills = params2list(character_query.item[49])
for (var/skill in skills)
if (skills[skill])
skills[skill] = text2num(skills[skill])
skill_specialization = character_query.item[50]
home_system = character_query.item[51]
citizenship = character_query.item[52]
@@ -530,8 +535,23 @@
params[":facial_colour"] = facial_hex
params[":skin_tone"] = s_tone
params[":skin_colour"] = skin_hex
params[":hair_style"] = h_style
params[":facial_style"] = f_style
if (istext(h_style))
params[":hair_style"] = h_style
else if (istype(h_style, /datum/sprite_accessory/hair))
var/datum/sprite_accessory/hair/current_h = h_style
params[":hair_style"] = current_h.name
else
params[":hair_style"] = "Bald"
if (istext(f_style))
params[":facial_style"] = f_style
else if (istype(h_style, /datum/sprite_accessory/facial_hair))
var/datum/sprite_accessory/facial_hair/current_f = f_style
params[":facial_style"] = current_f.name
else
params[":facial_style"] = "Shaved"
params[":eyes_colour"] = eyes_hex
params[":underwear"] = underwear
params[":undershirt"] = undershirt
+1 -1
View File
@@ -325,7 +325,7 @@
/datum/seed/koisspore
name = "koisspore"
seed_name = "kois"
seed_noun = "spires"
seed_noun = "spores"
display_name = "k'ois spores"
mutants = null
chems = list("koispaste" = list(25))
+1 -1
View File
@@ -40,7 +40,7 @@
/obj/machinery/seed_storage/garden
name = "Garden seed storage"
scanner = list("stats")
starting_seeds = list(/obj/item/seeds/appleseed = 3, /obj/item/seeds/bananaseed = 3, /obj/item/seeds/berryseed = 3, /obj/item/seeds/cabbageseed = 3, /obj/item/seeds/carrotseed = 3, /obj/item/seeds/chantermycelium = 3, /obj/item/seeds/cherryseed = 3, /obj/item/seeds/chiliseed = 3, /obj/item/seeds/cocoapodseed = 3, /obj/item/seeds/cornseed = 3, /obj/item/seeds/eggplantseed = 3, /obj/item/seeds/grapeseed = 3, /obj/item/seeds/grassseed = 3, /obj/item/seeds/replicapod = 3, /obj/item/seeds/lemonseed = 3, /obj/item/seeds/limeseed = 3, /obj/item/seeds/mtearseed = 2, /obj/item/seeds/orangeseed = 3, /obj/item/seeds/peanutseed = 3, /obj/item/seeds/plumpmycelium = 3, /obj/item/seeds/poppyseed = 3, /obj/item/seeds/potatoseed = 3, /obj/item/seeds/pumpkinseed = 3, /obj/item/seeds/riceseed = 3, /obj/item/seeds/soyaseed = 3, /obj/item/seeds/sugarcaneseed = 3, /obj/item/seeds/sunflowerseed = 3, /obj/item/seeds/shandseed = 2, /obj/item/seeds/tobaccoseed = 3, /obj/item/seeds/tomatoseed = 3, /obj/item/seeds/towermycelium = 3, /obj/item/seeds/watermelonseed = 3, /obj/item/seeds/wheatseed = 3, /obj/item/seeds/whitebeetseed = 3)
starting_seeds = list(/obj/item/seeds/appleseed = 3, /obj/item/seeds/bananaseed = 3, /obj/item/seeds/berryseed = 3, /obj/item/seeds/cabbageseed = 3, /obj/item/seeds/carrotseed = 3, /obj/item/seeds/chantermycelium = 3, /obj/item/seeds/cherryseed = 3, /obj/item/seeds/chiliseed = 3, /obj/item/seeds/cocoapodseed = 3, /obj/item/seeds/cornseed = 3, /obj/item/seeds/eggplantseed = 3, /obj/item/seeds/grapeseed = 3, /obj/item/seeds/grassseed = 3, /obj/item/seeds/replicapod = 3, /obj/item/seeds/lemonseed = 3, /obj/item/seeds/limeseed = 3, /obj/item/seeds/mtearseed = 2, /obj/item/seeds/orangeseed = 3, /obj/item/seeds/peanutseed = 3, /obj/item/seeds/plumpmycelium = 3, /obj/item/seeds/poppyseed = 3, /obj/item/seeds/potatoseed = 3, /obj/item/seeds/pumpkinseed = 3, /obj/item/seeds/riceseed = 3, /obj/item/seeds/soyaseed = 3, /obj/item/seeds/sugarcaneseed = 3, /obj/item/seeds/sunflowerseed = 3, /obj/item/seeds/shandseed = 2, /obj/item/seeds/tobaccoseed = 3, /obj/item/seeds/tomatoseed = 3, /obj/item/seeds/towermycelium = 3, /obj/item/seeds/watermelonseed = 3, /obj/item/seeds/wheatseed = 3, /obj/item/seeds/whitebeetseed = 3, /obj/item/seeds/koisspore = 3)
/obj/machinery/seed_storage/xenobotany
name = "Xenobotany seed storage"
+7 -13
View File
@@ -38,6 +38,9 @@
if(radio_controller)
radio_controller.add_object(listener, beacon_freq, filter = RADIO_NAVBEACONS)
spawn(10)
gib()
/mob/living/bot/cleanbot/proc/handle_target()
if(loc == target.loc)
if(!cleaning)
@@ -60,6 +63,9 @@
/mob/living/bot/cleanbot/Life()
..()
// Nope.jpg
return
var/found_spot
var/current_tile
var/cleanable_type = /obj/effect/decal/cleanable
@@ -80,19 +86,7 @@
if(screwloose && prob(5)) // Make a mess
if(istype(loc, /turf/simulated))
var/turf/simulated/T = loc
if(T.wet < 1)
T.wet = 1
if(T.wet_overlay)
T.overlays -= T.wet_overlay
T.wet_overlay = null
T.wet_overlay = image('icons/effects/water.dmi', T, "wet_floor")
T.overlays += T.wet_overlay
spawn(800)
if(istype(T) && T.wet < 2)
T.wet = 0
if(T.wet_overlay)
T.overlays -= T.wet_overlay
T.wet_overlay = null
T.wet_floor()
if(oddbutton && prob(5)) // Make a big mess
visible_message("Something flies out of [src]. He seems to be acting oddly.")
@@ -321,6 +321,6 @@
"eyes" = /obj/item/organ/eyes,
)
/datum/species/unathi/equip_survival_gear(var/mob/living/carbon/human/H)
/datum/species/bug/equip_survival_gear(var/mob/living/carbon/human/H)
..()
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H),slot_shoes)
@@ -158,24 +158,7 @@
T.visible_message("<span class='warning'>The water sizzles as it lands on \the [T]!</span>")
else if(volume >= 10)
if(T.wet >= 1)
return
T.wet = 1
if(T.wet_overlay)
T.overlays -= T.wet_overlay
T.wet_overlay = null
T.wet_overlay = image('icons/effects/water.dmi',T,"wet_floor")
T.overlays += T.wet_overlay
spawn(800) // This is terrible and needs to be changed when possible.
if(!T || !istype(T))
return
if(T.wet >= 2)
return
T.wet = 0
if(T.wet_overlay)
T.overlays -= T.wet_overlay
T.wet_overlay = null
T.wet_floor(1)
/datum/reagent/water/touch_obj(var/obj/O)
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
@@ -165,24 +165,7 @@
qdel(hotspot)
if(volume >= 3)
if(T.wet >= 1)
return
T.wet = 1
if(T.wet_overlay)
T.overlays -= T.wet_overlay
T.wet_overlay = null
T.wet_overlay = image('icons/effects/water.dmi',T,"wet_floor")
T.overlays += T.wet_overlay
spawn(800) // This is terrible and needs to be changed when possible.
if(!T || !istype(T))
return
if(T.wet >= 2)
return
T.wet = 0
if(T.wet_overlay)
T.overlays -= T.wet_overlay
T.wet_overlay = null
T.wet_floor()
/datum/reagent/nutriment/virus_food
name = "Virus Food"
@@ -1996,7 +1979,7 @@
glass_desc = "A mug of a rich strong roast, you think it could be a lot better if someone added something extra to it."
/datum/reagent/drink/white_coffee
name = "Café Au Lait"
name = "Café Au Lait"
id = "white_coffee"
description = "A fancy name for something thats just coffee and milk."
color = "#482000"
@@ -2007,7 +1990,7 @@
overdose = 40
glass_icon_state = "whitecoffee"
glass_name = "A mug of Café Au Lait"
glass_name = "A mug of Café Au Lait"
glass_desc = "A fancy name for something thats just coffee and milk."
/datum/reagent/drink/white_coffee/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
@@ -2015,7 +1998,7 @@
M.heal_organ_damage(0.5 * removed, 0)
/datum/reagent/drink/cafe_melange
name = "Café Mélange"
name = "Café Mélange"
id = "cafe_melange"
description = "A delicious mug of creamy coffee."
color = "#482000"
@@ -2026,9 +2009,9 @@
overdose = 40
glass_icon_state = "whitecoffee"
glass_name = "A mug of Café Mélange"
glass_name = "A mug of Café Mélange"
glass_desc = "A delicious mug of creamy coffee, keeps you cool headed in the most heated of situations."
/datum/reagent/drink/cafe_melange/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
M.reagents.add_reagent("kelotane", removed * 0.2)
M.reagents.add_reagent("kelotane", removed * 0.2)
@@ -329,17 +329,8 @@
if(!istype(T))
return
if(volume >= 1)
if(T.wet >= 2)
return
T.wet = 2
spawn(800)
if(!T || !istype(T))
return
T.wet = 0
if(T.wet_overlay)
T.overlays -= T.wet_overlay
T.wet_overlay = null
T.wet_floor(2)
/datum/reagent/silicate
name = "Silicate"
id = "silicate"
+77
View File
@@ -56,6 +56,83 @@
-->
<div class="commit sansserif">
<h2 class="date">22 June 2016</h2>
<h3 class="author">Alberyk updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Fixed wet floor tiles not drying over time.</li>
</ul>
<h3 class="author">Skull132 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Fixes toggleable vampire powers. They can now be turned off properly, even if you lack the blood required to activate them.</li>
<li class="bugfix">Fixed Presence not turning off when the vampire is knocked unconcious.</li>
</ul>
<h2 class="date">20 June 2016</h2>
<h3 class="author">Arrow768 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Mercenary Gamemode: Antag identities/ckeys not revealed at roundend</li>
</ul>
<h3 class="author">LordFowl updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Fixed female Vaurca sprites.</li>
</ul>
<h2 class="date">04 June 2016</h2>
<h3 class="author">Arrow768 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Fixed telescience</li>
</ul>
<h3 class="author">Skull132 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Saving characters that use species without hair is now fixed.</li>
<li class="rscdel">Cleanbots are temporarily disabled, due to infinite loops.</li>
</ul>
<h2 class="date">01 June 2016</h2>
<h3 class="author">LordFowl updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">K'ois spores will now properly spawn in hydroponics seed storages.</li>
<li class="bugfix">Vaurca will now spawn with appropriate footwear.</li>
</ul>
<h3 class="author">Skull132 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Skills are now properly loaded from SQL.</li>
<li class="bugfix">Skills are no longer nuked whenever importing characters onto SQL.</li>
</ul>
<h2 class="date">31 May 2016</h2>
<h3 class="author">Nanako updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Sterilizine will now clean wounds, to reduce and prevent infection</li>
<li class="tweak">Spraybottles now display a message when sprayed on any mob</li>
<li class="tweak">Proteins now restore blood twice as effectively</li>
<li class="rscadd">Unathi will no longer digest nutriment, only proteins</li>
<li class="rscadd">Added seafood protein. Space-carp fillets, and all recipes made with them, now contain seafood protein instead of animal protein</li>
<li class="rscadd">Skrell are able to safely digest seafood protein</li>
<li class="tweak">Unathi are now immune to Carpotoxin</li>
<li class="tweak">Mobs breathing a poisonous gas now get that chemical added to their bloodstream, instead of generic 'toxin'.</li>
<li class="tweak">Air alarms now properly say phoron instead of toxin</li>
<li class="tweak">Engine cooling computers now identify phoron as Ph instead of Tx</li>
<li class="bugfix">Passengers can now be removed from exosuit passenger compartments via the maintenance panel</li>
<li class="rscadd">Added a new Chemistry Gripper for cyborgs. It holds beakers, bottles, pills, pillbottles, spraybottles, labellers, and phoron sheets</li>
<li class="bugfix">Removed Large Beaker from crisis and research cyborgs, replaced with chemistry gripper</li>
<li class="bugfix">Cyborgs can now interact with reagent grinders</li>
<li class="rscadd">Cyborgs can now place objects in their gripper, on a table</li>
<li class="rscadd">Cyborgs can now place objects from their gripper into a disposal bin</li>
<li class="rscadd">Cyborgs can now use a gripper to take valid objects out of cardboard boxes</li>
<li class="tweak">Cyborgs can now use their other tools, on things held in their gripper</li>
<li class="tweak">Using an empty gripper on a machine now interacts with it</li>
<li class="tweak">Cyborgs can now use items held in their gripper on rechargers</li>
<li class="bugfix">Fixed the mutation chance on unstable mutagen. It was 1% of what it should have been</li>
<li class="rscadd">Added a little RP message when unstable mutagen does its thing</li>
<li class="bugfix">Sleepers will no longer eject their dialysis beaker and bug out when you eject a patient</li>
<li class="bugfix">Fixed a bug with medical machines where a patient could be duplicated</li>
<li class="rscadd">The dialysis beaker can now be checked and removed while a sleeper has no occupant</li>
<li class="rscadd">Male unathi can now break handcuffs.</li>
<li class="bugfix">Tajarans can now wear tajaran-specific gloves</li>
<li class="bugfix">Tajaran wardens, detectives and heads of security will properly spawn wearing black tajara gloves</li>
</ul>
<h2 class="date">30 May 2016</h2>
<h3 class="author">Akrilla updated:</h3>
<ul class="changes bgimages16">
+64
View File
@@ -1919,3 +1919,67 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- rscadd: Vampire is completely rewritten. Most of the powers have been tweaked
at the very least, if not completely reworked. New vampire players can consult
the 'Vampire Help' command ingame for further info.
2016-05-31:
Nanako:
- bugfix: Sterilizine will now clean wounds, to reduce and prevent infection
- tweak: Spraybottles now display a message when sprayed on any mob
- tweak: Proteins now restore blood twice as effectively
- rscadd: Unathi will no longer digest nutriment, only proteins
- rscadd: Added seafood protein. Space-carp fillets, and all recipes made with them,
now contain seafood protein instead of animal protein
- rscadd: Skrell are able to safely digest seafood protein
- tweak: Unathi are now immune to Carpotoxin
- tweak: Mobs breathing a poisonous gas now get that chemical added to their bloodstream,
instead of generic 'toxin'.
- tweak: Air alarms now properly say phoron instead of toxin
- tweak: Engine cooling computers now identify phoron as Ph instead of Tx
- bugfix: Passengers can now be removed from exosuit passenger compartments via
the maintenance panel
- rscadd: Added a new Chemistry Gripper for cyborgs. It holds beakers, bottles,
pills, pillbottles, spraybottles, labellers, and phoron sheets
- bugfix: Removed Large Beaker from crisis and research cyborgs, replaced with chemistry
gripper
- bugfix: Cyborgs can now interact with reagent grinders
- rscadd: Cyborgs can now place objects in their gripper, on a table
- rscadd: Cyborgs can now place objects from their gripper into a disposal bin
- rscadd: Cyborgs can now use a gripper to take valid objects out of cardboard boxes
- tweak: Cyborgs can now use their other tools, on things held in their gripper
- tweak: Using an empty gripper on a machine now interacts with it
- tweak: Cyborgs can now use items held in their gripper on rechargers
- bugfix: Fixed the mutation chance on unstable mutagen. It was 1% of what it should
have been
- rscadd: Added a little RP message when unstable mutagen does its thing
- bugfix: Sleepers will no longer eject their dialysis beaker and bug out when you
eject a patient
- bugfix: Fixed a bug with medical machines where a patient could be duplicated
- rscadd: The dialysis beaker can now be checked and removed while a sleeper has
no occupant
- rscadd: Male unathi can now break handcuffs.
- bugfix: Tajarans can now wear tajaran-specific gloves
- bugfix: Tajaran wardens, detectives and heads of security will properly spawn
wearing black tajara gloves
2016-06-01:
LordFowl:
- bugfix: K'ois spores will now properly spawn in hydroponics seed storages.
- bugfix: Vaurca will now spawn with appropriate footwear.
Skull132:
- bugfix: Skills are now properly loaded from SQL.
- bugfix: Skills are no longer nuked whenever importing characters onto SQL.
2016-06-04:
Arrow768:
- bugfix: Fixed telescience
Skull132:
- bugfix: Saving characters that use species without hair is now fixed.
- rscdel: Cleanbots are temporarily disabled, due to infinite loops.
2016-06-20:
Arrow768:
- bugfix: 'Mercenary Gamemode: Antag identities/ckeys not revealed at roundend'
LordFowl:
- bugfix: Fixed female Vaurca sprites.
2016-06-22:
Alberyk:
- bugfix: Fixed wet floor tiles not drying over time.
Skull132:
- bugfix: Fixes toggleable vampire powers. They can now be turned off properly,
even if you lack the blood required to activate them.
- bugfix: Fixed Presence not turning off when the vampire is knocked unconcious.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB