From 144b11ed142f4d1d1c975c38f57cfd9b1c729552 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sun, 10 May 2015 20:40:49 +0200 Subject: [PATCH 1/5] Adds announcement to the space vine event. --- code/modules/events/spacevine.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 8b4d7f9ef1..cf00e4f78b 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -1,5 +1,11 @@ /var/global/spacevines_spawned = 0 +/datum/event/spacevine + announceWhen = 10 + /datum/event/spacevine/start() spacevine_infestation() spacevines_spawned = 1 + +/datum/event/spacevine/announce() + command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg') From 10d8b3e72d767caac28904618c2150dd8f603bab Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sun, 10 May 2015 20:41:30 +0200 Subject: [PATCH 2/5] Changelog entry. --- html/changelogs/PsiOmegaDelta-LevelSevenBioHazard.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/PsiOmegaDelta-LevelSevenBioHazard.yml diff --git a/html/changelogs/PsiOmegaDelta-LevelSevenBioHazard.yml b/html/changelogs/PsiOmegaDelta-LevelSevenBioHazard.yml new file mode 100644 index 0000000000..c9a3d08e22 --- /dev/null +++ b/html/changelogs/PsiOmegaDelta-LevelSevenBioHazard.yml @@ -0,0 +1,5 @@ +author: PsiOmegaDelta +delete-after: True + +changes: + - rscadd: "The space vine event now comes with a station announcement." From 3fc9d8916357fb500ca8123c2fbdabf8aa201a6e Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Tue, 12 May 2015 01:56:51 +0100 Subject: [PATCH 3/5] Fixes vines not being vines. --- code/modules/hydroponics/trays/tray_process.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/hydroponics/trays/tray_process.dm b/code/modules/hydroponics/trays/tray_process.dm index 68e6fbce37..daa3586fd7 100644 --- a/code/modules/hydroponics/trays/tray_process.dm +++ b/code/modules/hydroponics/trays/tray_process.dm @@ -120,6 +120,14 @@ harvest = 1 lastproduce = age + // If we're a vine which is not in a closed tray and is at least half mature, and there's no vine currently on our turf: make one (maybe) + if(!closed_system && \ + seed.get_trait(TRAIT_SPREAD) == 2 && \ + 2 * age >= seed.get_trait(TRAIT_MATURATION) && \ + !(locate(/obj/effect/plant) in get_turf(src)) && \ + prob(2 * seed.get_trait(TRAIT_POTENCY))) + new /obj/effect/plant(get_turf(src), seed) + if(prob(3)) // On each tick, there's a chance the pest population will increase pestlevel += 0.1 * HYDRO_SPEED_MULTIPLIER From 569e785014200518354b51552383bfa8faab2a6e Mon Sep 17 00:00:00 2001 From: ccomp5950 Date: Mon, 11 May 2015 22:11:46 -0400 Subject: [PATCH 4/5] Holodeck items no longer spam admin attack logs. /obj/items now has no_attack_log variable if set to 1, it won't log. All holodeck items and lasertag weapons have no_attack_log set. <3 Mangled --- code/_onclick/item_attack.dm | 7 +++--- code/game/objects/items.dm | 3 ++- code/modules/holodeck/HolodeckObjects.dm | 1 + code/modules/projectiles/projectile.dm | 23 ++++++++++---------- code/modules/projectiles/projectile/beams.dm | 2 ++ 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index a81c6f30fa..2f9b786283 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -29,9 +29,10 @@ user.lastattacked = M M.lastattacker = user - user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])" - M.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])" - msg_admin_attack("[key_name(user)] attacked [key_name(M)] with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])" ) + if(!no_attack_log) + user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])" + M.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])" + msg_admin_attack("[key_name(user)] attacked [key_name(M)] with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])" ) ///////////////////////// var/power = force diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index ccef76c0f1..00693ec0a9 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -11,6 +11,7 @@ var/hitsound = null var/w_class = 3.0 var/slot_flags = 0 //This is used to determine on which slots an item can fit. + var/no_attack_log = 0 //If it's an item we don't want to log attack_logs with, set this to 1 pass_flags = PASSTABLE pressure_resistance = 5 // causeerrorheresoifixthis @@ -706,4 +707,4 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. if(!cannotzoom) usr.visible_message("[zoomdevicename ? "[usr] looks up from the [src.name]" : "[usr] lowers the [src.name]"].") - return \ No newline at end of file + return diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 7a7526b150..39680d70bf 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -192,6 +192,7 @@ /obj/item/weapon/holo damtype = HALLOSS + no_attack_log = 1 /obj/item/weapon/holo/esword desc = "May the force be within you. Sorta." diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 0ec99be4e9..f477deb25a 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -166,16 +166,17 @@ visible_message("\The [target_mob] is hit by \the [src] in the [parse_zone(def_zone)]!")//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter //admin logs - if(istype(firer, /mob)) - target_mob.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [target_mob]/[target_mob.ckey] with a [src.type]" - firer.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [target_mob]/[target_mob.ckey] with a [src.type]" - msg_admin_attack("[firer] ([firer.ckey]) shot [target_mob] ([target_mob.ckey]) with a [src] (JMP)") //BS12 EDIT ALG - else if(firer) - target_mob.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [target_mob]/[target_mob.ckey] with a [src]" - msg_admin_attack("UNKNOWN shot [target_mob] ([target_mob.ckey]) with a [src] (JMP)") //BS12 EDIT ALG - else - target_mob.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [target_mob]/[target_mob.ckey] with a [src]" - msg_admin_attack("UNKNOWN shot [target_mob] ([target_mob.ckey]) with a [src] (JMP)") //BS12 EDIT ALG + if(!no_attack_log) + if(istype(firer, /mob)) + target_mob.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [target_mob]/[target_mob.ckey] with a [src.type]" + firer.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [target_mob]/[target_mob.ckey] with a [src.type]" + msg_admin_attack("[firer] ([firer.ckey]) shot [target_mob] ([target_mob.ckey]) with a [src] (JMP)") //BS12 EDIT ALG + else if(firer) + target_mob.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [target_mob]/[target_mob.ckey] with a [src]" + msg_admin_attack("UNKNOWN shot [target_mob] ([target_mob.ckey]) with a [src] (JMP)") //BS12 EDIT ALG + else + target_mob.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [target_mob]/[target_mob.ckey] with a [src]" + msg_admin_attack("UNKNOWN shot [target_mob] ([target_mob.ckey]) with a [src] (JMP)") //BS12 EDIT ALG //sometimes bullet_act() will want the projectile to continue flying if (target_mob.bullet_act(src, def_zone) == -1) @@ -324,4 +325,4 @@ trace.firer = user var/output = trace.process() //Test it! del(trace) //No need for it anymore - return output //Send it back to the gun! \ No newline at end of file + return output //Send it back to the gun! diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index b5ce31b168..9dbfce92f1 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -120,6 +120,7 @@ var/list/beam_master = list() icon_state = "bluelaser" pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE damage = 0 + no_attack_log = 1 damage_type = BURN check_armour = "laser" @@ -135,6 +136,7 @@ var/list/beam_master = list() icon_state = "laser" pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE damage = 0 + no_attack_log = 1 damage_type = BURN check_armour = "laser" From 31bcb717dc9c0f533a2908d8715c699e675380e9 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Tue, 12 May 2015 13:42:20 +0200 Subject: [PATCH 5/5] Changelog update. --- html/changelog.html | 19 ++++++++++ html/changelogs/.all_changelog.yml | 11 ++++++ html/changelogs/Dennok-PR-9173.yml | 6 --- html/changelogs/HarpyEagle-fooddrinkpill.yml | 7 ---- html/changelogs/MrSnapwalk-PR-9166.yml | 37 ------------------- .../PsiOmegaDelta-LevelSevenBioHazard.yml | 5 --- 6 files changed, 30 insertions(+), 55 deletions(-) delete mode 100644 html/changelogs/Dennok-PR-9173.yml delete mode 100644 html/changelogs/HarpyEagle-fooddrinkpill.yml delete mode 100644 html/changelogs/MrSnapwalk-PR-9166.yml delete mode 100644 html/changelogs/PsiOmegaDelta-LevelSevenBioHazard.yml diff --git a/html/changelog.html b/html/changelog.html index 4ca2d83a96..8e4e854561 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,25 @@ -->
+

12 May 2015

+

Dennok updated:

+
    +
  • New buildmode icons made by BartNixon.
    • +
+

HarpyEagle updated:

+
    +
  • Masks and helmets that cover the face block feeding food, drinks, and pills.
    • +
+

MrSnapwalk updated:

+
    +
  • Added seven new AI core displays.
    • +
  • Changed the pAI sprite and added several new expressions.
    • +
+

PsiOmegaDelta updated:

+
    +
  • The space vine event now comes with a station announcement.
    • +
+

11 May 2015

Mloc updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 99c8c1e542..f6b7d619d1 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -1751,3 +1751,14 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - rscadd: Voidsuits can have tanks inserted into the storage slot. - rscadd: Voidsuits display helpful information on their contents on examine. - rscadd: Magboots can be equipped over other shoes. Except other magboots. +2015-05-12: + Dennok: + - imageadd: New buildmode icons made by BartNixon. + HarpyEagle: + - rscadd: Masks and helmets that cover the face block feeding food, drinks, and + pills. + MrSnapwalk: + - imageadd: Added seven new AI core displays. + - tweak: Changed the pAI sprite and added several new expressions. + PsiOmegaDelta: + - rscadd: The space vine event now comes with a station announcement. diff --git a/html/changelogs/Dennok-PR-9173.yml b/html/changelogs/Dennok-PR-9173.yml deleted file mode 100644 index 7828a53425..0000000000 --- a/html/changelogs/Dennok-PR-9173.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Dennok - -delete-after: True - -changes: - - imageadd: "New buildmode icons made by BartNixon." diff --git a/html/changelogs/HarpyEagle-fooddrinkpill.yml b/html/changelogs/HarpyEagle-fooddrinkpill.yml deleted file mode 100644 index c9f64eb4d9..0000000000 --- a/html/changelogs/HarpyEagle-fooddrinkpill.yml +++ /dev/null @@ -1,7 +0,0 @@ - -author: HarpyEagle - -delete-after: True - -changes: - - rscadd: "Masks and helmets that cover the face block feeding food, drinks, and pills." diff --git a/html/changelogs/MrSnapwalk-PR-9166.yml b/html/changelogs/MrSnapwalk-PR-9166.yml deleted file mode 100644 index 7dce8c74bc..0000000000 --- a/html/changelogs/MrSnapwalk-PR-9166.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: MrSnapwalk - -# 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: - - imageadd: "Added seven new AI core displays." - - tweak: "Changed the pAI sprite and added several new expressions." diff --git a/html/changelogs/PsiOmegaDelta-LevelSevenBioHazard.yml b/html/changelogs/PsiOmegaDelta-LevelSevenBioHazard.yml deleted file mode 100644 index c9a3d08e22..0000000000 --- a/html/changelogs/PsiOmegaDelta-LevelSevenBioHazard.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: PsiOmegaDelta -delete-after: True - -changes: - - rscadd: "The space vine event now comes with a station announcement."