diff --git a/Nanako-PR-330.txt b/Nanako-PR-330.txt deleted file mode 100644 index fff0a74822c..00000000000 --- a/Nanako-PR-330.txt +++ /dev/null @@ -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" \ No newline at end of file diff --git a/Nanako-PR-331.yml b/Nanako-PR-331.yml deleted file mode 100644 index e5c0edf0127..00000000000 --- a/Nanako-PR-331.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 -# 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" \ No newline at end of file diff --git a/Nanako-PR-333.yml b/Nanako-PR-333.yml deleted file mode 100644 index 3598454bb96..00000000000 --- a/Nanako-PR-333.yml +++ /dev/null @@ -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" - diff --git a/Nanako-PR-334.yml b/Nanako-PR-334.yml deleted file mode 100644 index 899a2e4fe91..00000000000 --- a/Nanako-PR-334.yml +++ /dev/null @@ -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" \ No newline at end of file diff --git a/Nanako-PR-338.yml b/Nanako-PR-338.yml deleted file mode 100644 index 596398bc8cf..00000000000 --- a/Nanako-PR-338.yml +++ /dev/null @@ -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" diff --git a/Nanako-PR-343.yml b/Nanako-PR-343.yml deleted file mode 100644 index 31f5206f3fa..00000000000 --- a/Nanako-PR-343.yml +++ /dev/null @@ -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" diff --git a/Nanako-PR-345.yml b/Nanako-PR-345.yml deleted file mode 100644 index 59442c8ebf2..00000000000 --- a/Nanako-PR-345.yml +++ /dev/null @@ -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" - diff --git a/Nanako-PR-346.yml b/Nanako-PR-346.yml deleted file mode 100644 index 72bef016040..00000000000 --- a/Nanako-PR-346.yml +++ /dev/null @@ -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." - diff --git a/Nanako-PR-348.yml b/Nanako-PR-348.yml deleted file mode 100644 index 236548b2789..00000000000 --- a/Nanako-PR-348.yml +++ /dev/null @@ -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" - diff --git a/SQL/Aurora_SQL_Schema.sql b/SQL/Aurora_SQL_Schema.sql index fde5c034e8c..8c143089c92 100644 --- a/SQL/Aurora_SQL_Schema.sql +++ b/SQL/Aurora_SQL_Schema.sql @@ -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, diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index df26cc5622b..0ac1c5b6d78 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -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); diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 33458545532..56206898079 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -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) diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index 33c617ac7d3..08218ec1fbe 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -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 << "You cannot maintain this form while unconcious." + spawn(10) + if (owner_mob.stat == 1) + owner_mob << "You are ejected from the Veil." + 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 << "You do not have enough usable blood. 15 needed." + return vampire.status |= VAMP_HEALING src << "You begin the process of blood healing. Do not move, and ensure that you are not interrupted." @@ -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 << "You are no longer influencing those weak of mind." return + else if (vampire.blood_usable < 15) + src << "You do not have enough usable blood. 15 needed." + return src << "You begin passively influencing the weak minded." vampire.status |= VAMP_PRESENCE @@ -747,6 +769,11 @@ // Run every 20 seconds sleep(200) + if (stat) + src << "You cannot influence people around you while [stat == 1 ? "unconcious" : "dead"]." + vampire.status &= ~VAMP_PRESENCE + break + for (var/mob/living/carbon/human/T in view(5)) if (T == src) continue diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 5c585e3f2d0..97879aecf9d 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -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 diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 31d81167dde..afae4811745 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -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() diff --git a/code/modules/client/preferences_save_migration.dm b/code/modules/client/preferences_save_migration.dm index 50c1cf85ea5..70b6c9bdcf8 100644 --- a/code/modules/client/preferences_save_migration.dm +++ b/code/modules/client/preferences_save_migration.dm @@ -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].") diff --git a/code/modules/client/preferences_sql.dm b/code/modules/client/preferences_sql.dm index 920fd744807..b7403ed282a 100644 --- a/code/modules/client/preferences_sql.dm +++ b/code/modules/client/preferences_sql.dm @@ -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 diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index 94bc519aa43..aac344f3765 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -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)) diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index 448173104be..3e533768886 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -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" diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm index ab2d223c930..2c733bbd688 100644 --- a/code/modules/mob/living/bot/cleanbot.dm +++ b/code/modules/mob/living/bot/cleanbot.dm @@ -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.") diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index 3526cde56fc..4f659764c50 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -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) \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm index 8dc2e37c0ff..32224d0ad38 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm @@ -158,24 +158,7 @@ T.visible_message("The water sizzles as it lands on \the [T]!") 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)) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index a268529a0e5..c12393fd3e6 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -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) \ No newline at end of file + M.reagents.add_reagent("kelotane", removed * 0.2) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm index 28d7f5aa638..cc12f1f00e1 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm @@ -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" diff --git a/html/changelog.html b/html/changelog.html index 7c4e5fd696a..35ecbca3350 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,83 @@ -->
+

22 June 2016

+

Alberyk updated:

+ +

Skull132 updated:

+ + +

20 June 2016

+

Arrow768 updated:

+ +

LordFowl updated:

+ + +

04 June 2016

+

Arrow768 updated:

+ +

Skull132 updated:

+ + +

01 June 2016

+

LordFowl updated:

+ +

Skull132 updated:

+ + +

31 May 2016

+

Nanako updated:

+ +

30 May 2016

Akrilla updated: