diff --git a/Scopes Files/signal_modifier.dm b/Scopes Files/signal_modifier.dm new file mode 100644 index 00000000..fe799ae3 --- /dev/null +++ b/Scopes Files/signal_modifier.dm @@ -0,0 +1,36 @@ +//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 Modifier" + desc = "Used for Stuff." //and here + 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 + usr << "\blue You remove the tag from the [name]" + setting = null + return + + if(length(str) > 50) + usr << "\red Text too long." + return + + setting = str + usr << "\blue You change the tag setting to [setting]" \ 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]." 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) 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() 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 ff535791..0b30f62d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,36 @@ should be listed in the changelog upon commit though. Thanks. --> +