From 3e294af826e8b75760eab430ca271152dd0102f8 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 19 Mar 2017 13:57:12 -0500 Subject: [PATCH 1/3] 'Give' verb --- .../components/binary_devices/volume_pump.dm | 4 +- code/modules/mob/living/carbon/give.dm | 58 +++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 code/modules/mob/living/carbon/give.dm diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm index d3dbba85cd..ecdbd35d0d 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm @@ -117,7 +117,7 @@ Thus, the two variables affect pump operation are set in New(): if(..()) return var/turf/T = get_turf(src) - var/area/A = get_area(src) + //var/area/A = get_area(src) switch(action) if("power") on = !on @@ -179,7 +179,7 @@ Thus, the two variables affect pump operation are set in New(): /obj/machinery/atmospherics/components/binary/volume_pump/can_unwrench(mob/user) if(..()) var/turf/T = get_turf(src) - var/area/A = get_area(src) + //var/area/A = get_area(src) if(!(stat & NOPOWER) && on) user << "You cannot unwrench this [src], turn it off first!" else diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm new file mode 100644 index 0000000000..392b494d00 --- /dev/null +++ b/code/modules/mob/living/carbon/give.dm @@ -0,0 +1,58 @@ +/mob/living/verb/give() + set category = "IC" + set name = "Give" + set src in oview(1) //Cannot handle giving shit to mobs on your own tile, but it's a small, small loss + + give_item(usr) + +/mob/living/proc/give_item(mob/living/carbon/user) + + +/mob/living/carbon/give_item(mob/living/carbon/user) + if(!istype(user)) + return + if(src.stat == 2 || user.stat == 2 || src.client == null) + return + if(src.handcuffed) + user << "Those hands are cuffed right now." + return //Can't receive items while cuffed + var/obj/item/I + if(user.get_active_held_item() == null) + user << "You don't have anything in your [get_held_index_name(get_held_index_of_item(I))] to give to [src]." + return + I = user.get_active_held_item() + if(!I) + return + if(src == user) //Shouldn't happen + user << "You tried to give yourself \the [I], but you didn't want it." + return + if(get_empty_held_index_for_side()) + switch(alert(src, "[user] wants to give you \a [I]?", , "Yes", "No")) + if("Yes") + if(!I) + return + if(!Adjacent(user)) + user <<"You need to stay still while giving an object." + src << "[user] moved away."//What an asshole + + return + if(user.get_active_held_item() != I) + user << "You need to keep the item in your hand." + src << "[user] has put \the [I] away!" + return + if(!get_empty_held_index_for_side()) + user << "Your hands are full." + user << "Their hands are full." + return + if(!user.drop_item(I)) + src << "[user] can't let go of \the [I]!" + user << "You can't seem to let go of \the [I]." + return + + src.put_in_hands(I) + update_inv_hands() + src.visible_message("[user] handed \the [I] to [src].") + if("No") + src.visible_message("[user] tried to hand \the [I] to [src] but \he didn't want it.") + else + user << "[src]'s hands are full." \ No newline at end of file From 9aa076b316c703e317a6984e5299d379dd9bf7b1 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 19 Mar 2017 14:00:41 -0500 Subject: [PATCH 2/3] changelogs/Jay-PR-296.yml --- html/changelogs/Jay-PR-296.yml | 36 ++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/Jay-PR-296.yml diff --git a/html/changelogs/Jay-PR-296.yml b/html/changelogs/Jay-PR-296.yml new file mode 100644 index 0000000000..48aa13aa11 --- /dev/null +++ b/html/changelogs/Jay-PR-296.yml @@ -0,0 +1,36 @@ +################################ +# 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 +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: " + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a changelog editing system that should cause fewer conflicts and more accurate timestamps." + - rscdel: "Killed innocent kittens." From d54562b707c846180437da2e164e4d32671097c2 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 19 Mar 2017 14:33:20 -0500 Subject: [PATCH 3/3] fix changelogs/Jay-PR-296.yml --- html/changelogs/Jay-PR-296.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/html/changelogs/Jay-PR-296.yml b/html/changelogs/Jay-PR-296.yml index 48aa13aa11..4910b35342 100644 --- a/html/changelogs/Jay-PR-296.yml +++ b/html/changelogs/Jay-PR-296.yml @@ -21,7 +21,7 @@ ################################# # Your name. -author: " +author: "Jay" # Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. delete-after: True @@ -32,5 +32,5 @@ delete-after: True # Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. # Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. changes: - - rscadd: "Added a changelog editing system that should cause fewer conflicts and more accurate timestamps." - - rscdel: "Killed innocent kittens." + - rscadd: "Added the Give verb in the IC tab." +