From 79d7e7218ced9d64a57aecbc9900de53a9468ff2 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Sat, 16 Aug 2014 10:01:21 +0100 Subject: [PATCH 1/8] Change log If I missed something out it's because I missed it or thought they should have to hunt for it. --- html/changelog.html | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/html/changelog.html b/html/changelog.html index ff535791..a7f1c8d7 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,23 @@ should be listed in the changelog upon commit though. Thanks. --> +
+

16 August 2014

+

Sound Scopes updated:

+ +
+

10 August 2014

SoundScopes updated:

From 5cd3dc2a63509c8507b998ed9ba136e5df070dc5 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Sat, 16 Aug 2014 10:52:47 +0100 Subject: [PATCH 2/8] Fried food Nerf nutriment 30 - Nope now 10. --- code/modules/reagents/reagent_containers/food/snacks.dm | 2 +- html/changelog.html | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 2c7f9b3c..186db440 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -278,7 +278,7 @@ deepfried = 1 New() ..() - reagents.add_reagent("nutriment", 30) + reagents.add_reagent("nutriment", 10) /obj/item/weapon/reagent_containers/food/snacks/candy name = "candy" diff --git a/html/changelog.html b/html/changelog.html index a7f1c8d7..85933541 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -68,6 +68,11 @@ should be listed in the changelog upon commit though. Thanks. -->
  • Operating table, Some Vending Machines, and Chemistry machinery can be moved
  • Space more dangerousVamipres - Screech shatters windows in a wider range
  • Hats, shoes, scrubs added to custom loadouts
    • +
  • Fried food nerfed
    • +
  • Vampires - Many vamp abilities increased in cooldown
    • +
  • Vampires - Diseased touch costs 200 blood, unlocks at 200
    • +
  • Vampires - Screech shatters windows in a wider range. Cost bumped to 90. Cooldown doubled
    • +
  • Vampires - Vampjaunt cost bumped slightly
  • Vamipres - Diseased touch costs 200
  • Vampires - Hypnotize cooldown cut in half
    • From 241b1ff290c7939d33f8f4fb934d013b09661524 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Sun, 17 Aug 2014 10:41:01 +0100 Subject: [PATCH 3/8] Vote counter fix - It didn't actually take away the last_vote_time from the worldtime --- Scopes Files/signal_modifier.dm | 3 +++ code/controllers/voting.dm | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 Scopes Files/signal_modifier.dm diff --git a/Scopes Files/signal_modifier.dm b/Scopes Files/signal_modifier.dm new file mode 100644 index 00000000..928cfc0e --- /dev/null +++ b/Scopes Files/signal_modifier.dm @@ -0,0 +1,3 @@ +//and come here + +//Make a thing that changes id's on stuff to change what they do \ No newline at end of file diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index 0d27d567..1ec3eeed 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -235,10 +235,10 @@ datum/controller/vote else return 0 mode = vote_type initiator = initiator_key - started_time = world.time - var/timedifference = world.time - last_vote_time + var/timedifference = round((world.time - last_vote_time)) var/timedifference_text timedifference_text = time2text(timedifference,"mm:ss") + msg_scopes("timedifference_text: [timedifference_text]") for(var/client/C in admins) C << "Time since last vote: [timedifference_text]" var/text = "[capitalize(mode)] vote started by [initiator]." From c45157928f93253d63d5984a0fbfcd50f5665aa0 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Sun, 17 Aug 2014 20:06:06 +0100 Subject: [PATCH 4/8] Stop AI Floating Stops the AI floating when bolted to the ground --- Scopes Files/signal_modifier.dm | 42 ++++++++++++++++++++++-- code/modules/mob/living/silicon/ai/ai.dm | 9 +++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/Scopes Files/signal_modifier.dm b/Scopes Files/signal_modifier.dm index 928cfc0e..5375a651 100644 --- a/Scopes Files/signal_modifier.dm +++ b/Scopes Files/signal_modifier.dm @@ -1,3 +1,41 @@ -//and come here +//Make a thing that changes id's on stuff to change what they do -//Make a thing that changes id's on stuff to change what they do \ No newline at end of file +/obj/item/device/signaltool + name = "Signal Modifyer" + desc = "Used for Stuff." + icon_state = "multitool" + flags = FPRINT | TABLEPASS| CONDUCT //check out + force = 5.0 + w_class = 2.0 + throwforce = 5.0 + throw_range = 15 + throw_speed = 3 + desc = "Sound should really make a description for this." //here to + m_amt = 50 + g_amt = 20 + origin_tech = "magnets=1;engineering=1" + var/setting = null + + attack_self(mob/M as mob) + var/prevname = "[setting]" + var/str = trim(stripped_input(usr,"New ID tag:","Signal Altering", prevname, MAX_NAME_LEN)) + if(!str || !length(str) || str==prevname) //cancel + return + if(length(str) > 50) + usr << "\red Text too long." + return + setting = str + +//I secretly have no idea what I am doing with this stuff +//it could work + attack(var/obj/machinery/O as obj) + if(!setting) + return + if(!O.id) + msg_scopes("no id thing") + else + if(O.id != setting) + usr << "\blue You alter the componants signal id" + O.id = setting + else + user << "\red The id's are the same" diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index de8c1d63..720e7556 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -725,7 +725,16 @@ var/list/ai_list = list() user.visible_message("\blue \The [user] decides not to bolt \the [src].") return user.visible_message("\blue \The [user] finishes fastening down \the [src]!") + if(floating) + float(0) anchored = 1 return else return ..() + +/mob/living/silicon/ai/float(var/on = 0) + if(anchored) + msg_scopes("AI is bolted") + ..(0) + else + ..(on) From 429a7b6c3bca811afaef4519cd10452546a41b80 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Sun, 17 Aug 2014 20:09:51 +0100 Subject: [PATCH 5/8] changelog Changelog >_> --- html/changelog.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/html/changelog.html b/html/changelog.html index 85933541..d59bac99 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -60,9 +60,15 @@ should be listed in the changelog upon commit though. Thanks. -->

    16 August 2014

    Sound Scopes updated:

      +
    • Custom loadout - Green Plaid Skirt
      • +
    • Custom loadout - Old Man Suit
      • +
    • Custom loadout - Executive Suit
      • +
    • Custom loadout - Canes
      • +
    • Custom loadout - A few caps
    • Burstfire x-ray laser
    • Orderable Atmospheric machines. Freezers/Heaters/Airtanks
    • Defibrillator
      • +
    • Bolted down AI's no longer float
    • Rolled up sleeves for Secutiry
    • Vox no longer die to death as soon as they inhale any O2
    • Operating table, Some Vending Machines, and Chemistry machinery can be moved
      • From f91d9f241ef8e187f4f51e87780bb6fe2cae599c Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Sun, 17 Aug 2014 22:41:13 +0100 Subject: [PATCH 6/8] changelog again and starts of the new tool thing skull asked for --- Scopes Files/signal_modifier.dm | 5 +++-- html/changelog.html | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Scopes Files/signal_modifier.dm b/Scopes Files/signal_modifier.dm index 5375a651..8bba7d87 100644 --- a/Scopes Files/signal_modifier.dm +++ b/Scopes Files/signal_modifier.dm @@ -28,7 +28,8 @@ //I secretly have no idea what I am doing with this stuff //it could work - attack(var/obj/machinery/O as obj) +//Well what the donkey tail, of cause it won't + attack(var/obj/O as obj) if(!setting) return if(!O.id) @@ -38,4 +39,4 @@ usr << "\blue You alter the componants signal id" O.id = setting else - user << "\red The id's are the same" + usr << "\red The id's are the same" diff --git a/html/changelog.html b/html/changelog.html index d59bac99..0b30f62d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -68,6 +68,7 @@ should be listed in the changelog upon commit though. Thanks. -->
    • Burstfire x-ray laser
    • Orderable Atmospheric machines. Freezers/Heaters/Airtanks
    • Defibrillator
      • +
    • Vox Leap
    • Bolted down AI's no longer float
    • Rolled up sleeves for Secutiry
    • Vox no longer die to death as soon as they inhale any O2
      • @@ -75,6 +76,7 @@ should be listed in the changelog upon commit though. Thanks. -->
    • Space more dangerousVamipres - Screech shatters windows in a wider range
    • Hats, shoes, scrubs added to custom loadouts
    • Fried food nerfed
      • +
    • Low air pressure is deadly
    • Vampires - Many vamp abilities increased in cooldown
    • Vampires - Diseased touch costs 200 blood, unlocks at 200
    • Vampires - Screech shatters windows in a wider range. Cost bumped to 90. Cooldown doubled
      • From dd8d7a0f8251da138f3042a794d30b06deb2e9f7 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Mon, 18 Aug 2014 23:09:10 +0100 Subject: [PATCH 7/8] Signal Modifier changes A few things, to make it properly I will need to change a few files, am waiting until there are less things to merge to setup. --- Scopes Files/signal_modifier.dm | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/Scopes Files/signal_modifier.dm b/Scopes Files/signal_modifier.dm index 8bba7d87..fe799ae3 100644 --- a/Scopes Files/signal_modifier.dm +++ b/Scopes Files/signal_modifier.dm @@ -1,8 +1,12 @@ //Make a thing that changes id's on stuff to change what they do +// +// This is only the item, I have some plans on how this could work with minimal file +// editing but we will have to see first. Need to decide what it will change on everything too. +// /obj/item/device/signaltool - name = "Signal Modifyer" - desc = "Used for Stuff." + name = "Signal Modifier" + desc = "Used for Stuff." //and here icon_state = "multitool" flags = FPRINT | TABLEPASS| CONDUCT //check out force = 5.0 @@ -20,23 +24,13 @@ var/prevname = "[setting]" var/str = trim(stripped_input(usr,"New ID tag:","Signal Altering", prevname, MAX_NAME_LEN)) if(!str || !length(str) || str==prevname) //cancel + usr << "\blue You remove the tag from the [name]" + setting = null return + if(length(str) > 50) usr << "\red Text too long." return - setting = str -//I secretly have no idea what I am doing with this stuff -//it could work -//Well what the donkey tail, of cause it won't - attack(var/obj/O as obj) - if(!setting) - return - if(!O.id) - msg_scopes("no id thing") - else - if(O.id != setting) - usr << "\blue You alter the componants signal id" - O.id = setting - else - usr << "\red The id's are the same" + setting = str + usr << "\blue You change the tag setting to [setting]" \ No newline at end of file From 8b7b813e54cbcf6ea743fdb5c3fac129e2a1bf03 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Tue, 19 Aug 2014 01:37:28 +0100 Subject: [PATCH 8/8] No AI's Float --- code/modules/mob/living/silicon/decoy/decoy.dm | 5 ++++- code/modules/mob/living/silicon/pai/pai.dm | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/decoy/decoy.dm b/code/modules/mob/living/silicon/decoy/decoy.dm index 1ef6a274..1102a830 100644 --- a/code/modules/mob/living/silicon/decoy/decoy.dm +++ b/code/modules/mob/living/silicon/decoy/decoy.dm @@ -9,4 +9,7 @@ src.icon = 'icons/mob/AI.dmi' src.icon_state = "ai" src.anchored = 1 - src.canmove = 0 \ No newline at end of file + src.canmove = 0 + +/mob/living/silicon/decoy/float(var/on) + return //No, just no floating for these - SoundScopes \ No newline at end of file diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 18e09497..20cb7b6e 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -236,6 +236,10 @@ src.unset_machine() src:cameraFollow = null + +/mob/living/silicon/pai/float(var/on) //No, just no floating for these - SoundScopes + return + //Addition by Mord_Sith to define AI's network change ability /* /mob/living/silicon/pai/proc/pai_network_change()