From d092850ec694ba30365b7dd96c01630a1f94b4d5 Mon Sep 17 00:00:00 2001 From: Verkister Date: Sat, 8 Jul 2017 14:23:59 +0300 Subject: [PATCH 1/5] Minor borgotool tweaks. -Increases lightbulb fabrication cost in janipup lightreplacer. -Makes the bellymodules use their respective names in the "sleeper unoccupied" UI message. -Fixes a bug I just found where refreshing via sleeper UI button made a passive trash filled belly disappear. --- .../mob/living/silicon/robot/dogborg/dog_modules_vr.dm | 4 ++-- .../mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm index 217faf94f8..c61764f2d2 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm @@ -323,13 +323,13 @@ return if(uses < max_uses && cooldown == 0) var/mob/living/silicon/robot.R = user - if(R.cell.charge <= 800) + if(R.cell.charge <= 1000) user << "Insufficient power reserves. Please recharge." return usr << "It has [uses] lights remaining. Attempting to fabricate a replacement. Please stand still." cooldown = 1 if(do_after(user, 50)) - R.cell.charge = R.cell.charge - 400 + R.cell.charge = R.cell.charge - 800 AddUses(1) cooldown = 0 else diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index d7eed2dc8b..f949151f4c 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -136,7 +136,7 @@ dat += "[length(items_preserved)] uncleanable object(s).
" if(!patient) - dat += "Sleeper Unoccupied" + dat += "[src.name] Unoccupied" else dat += "[patient.name] => " @@ -285,7 +285,7 @@ hound.sleeper_g = 0 //Couldn't find anyone, and not cleaning - else if(!cleaning && !patient) + else if((!cleaning && !patient) || (length(contents) > 11)) hound.sleeper_r = 0 hound.sleeper_g = 0 From b5f198ba3e11fad05cacf75e6767adef6059128b Mon Sep 17 00:00:00 2001 From: Verkister Date: Sat, 8 Jul 2017 14:26:51 +0300 Subject: [PATCH 2/5] whoops pasted in the wrong part lmao --- .../mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index f949151f4c..b12807ba7f 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -280,12 +280,12 @@ return(C) //Cleaning looks better with red on, even with nobody in it - if(cleaning && !patient) + if((cleaning && !patient) || (length(contents) > 11)) hound.sleeper_r = 1 hound.sleeper_g = 0 //Couldn't find anyone, and not cleaning - else if((!cleaning && !patient) || (length(contents) > 11)) + else if(!cleaning && !patient) hound.sleeper_r = 0 hound.sleeper_g = 0 From b5aa8ce1c0f9aaa061a16a031bec6c65d7368f81 Mon Sep 17 00:00:00 2001 From: Verkister Date: Sat, 8 Jul 2017 16:48:29 +0300 Subject: [PATCH 3/5] More borgogut features! -Gurgled items now give charge based on their size/w_class. -Gurgled storage items now drop their contents to be gurgled next instead of just vanishing with them. -Gurgled people now drop their items to be gurgled as well. -Gurgling IDs now gives them the classic gurgle treatment, ruining them instead of deleting. --- .../silicon/robot/dogborg/dog_sleeper_vr.dm | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index b12807ba7f..daf10d5758 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -368,7 +368,8 @@ for(var/mob/hearer in range(1,src.hound)) hearer << deathsound T << deathsound - //Spill(T) //TODOPOLARIS + for(var/obj/item/I in T.contents)//Placeholder for proper spill proc + T.drop_from_inventory(I, src) qdel(T) src.update_patient() @@ -384,26 +385,39 @@ //If the object is not one to preserve else //Special case for PDAs as they are dumb. TODO fix Del on PDAs to be less dumb. - if (istype(T, /obj/item/device/pda)) + if(istype(T, /obj/item/device/pda)) var/obj/item/device/pda/PDA = T if (PDA.id) PDA.id.forceMove(src) PDA.id = null - qdel(T) - //Special case for IDs to make them digested - //else if (istype(T, /obj/item/weapon/card/id)) - //var/obj/item/weapon/card/id/ID = T - //ID.digest() //Need the digest proc, first. + if(istype(T, /obj/item/weapon/card/id)) + var/obj/item/weapon/card/id/ID = T + ID.desc = "A partially digested card that has seen better days. Much of it's data has been destroyed." + ID.icon = 'icons/obj/card_vr.dmi' + ID.icon_state = "digested" + ID.access = list() // No access + src.items_preserved += ID //Anything not perserved, PDA, or ID + else if(istype(T, /obj/item)) + if(istype(T, /obj/item/weapon/storage)) + var/obj/item/weapon/storage/S = T + for(var/obj/item/I in S.contents)//Placeholder for proper spill proc + S.remove_from_storage(I, src) + src.hound.cell.charge += (50 * S.w_class) + qdel(S) + src.update_patient() + else + src.hound.cell.charge += (50 * T.w_class) + qdel(T) + src.update_patient() else - //Spill(T) //Needs the spill proc to be added + src.hound.cell.charge += 120 qdel(T) src.update_patient() - src.hound.cell.charge += 120 //10 charge? that was such a practically nonexistent number it hardly gave any purpose for this bit :v *cranks up* return /obj/item/device/dogborg/sleeper/process() From 80c12df37cf19e72de8ea9af7e7e1cc90e390d3b Mon Sep 17 00:00:00 2001 From: Verkister Date: Sat, 8 Jul 2017 17:42:42 +0300 Subject: [PATCH 4/5] better no caps than One in the middle --- code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index daf10d5758..3c76993994 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -136,7 +136,7 @@ dat += "[length(items_preserved)] uncleanable object(s).
" if(!patient) - dat += "[src.name] Unoccupied" + dat += "[src.name] unoccupied" else dat += "[patient.name] => " From 024cc65175da445ae2cb3afe818a39c5107fa60a Mon Sep 17 00:00:00 2001 From: Verkister Date: Sat, 8 Jul 2017 21:05:39 +0300 Subject: [PATCH 5/5] irrelevant fluffstuff -I just happened to feel so extra again and wanted to use my github dog logo somewhere, which happened to become a custom icon for eggnerd robolimb design disk. --- code/modules/organs/robolimbs_vr.dm | 2 ++ icons/obj/items_vr.dmi | Bin 628 -> 1042 bytes 2 files changed, 2 insertions(+) diff --git a/code/modules/organs/robolimbs_vr.dm b/code/modules/organs/robolimbs_vr.dm index 8db0d12cb2..33b92e9e95 100644 --- a/code/modules/organs/robolimbs_vr.dm +++ b/code/modules/organs/robolimbs_vr.dm @@ -43,6 +43,8 @@ /obj/item/weapon/disk/limb/eggnerdltd company = "Eggnerd Prototyping Ltd." + icon = 'icons/obj/items_vr.dmi' + icon_state = "verkdisk" //////////////// General VS-only ones ///////////////// /datum/robolimb/talon //They're buildable by default due to being extremely basic. diff --git a/icons/obj/items_vr.dmi b/icons/obj/items_vr.dmi index 06677bf537da747d5535542307f2d37646823f0e..312f2691c1f0ac852b1d3bc9ca0ce0272aa6902b 100644 GIT binary patch literal 1042 zcmV+t1nv8YP)V=-0C=2r%CQQAFce1NIrk}kbT6&#nx#Y}gT6x`x6Q>iLT)gx-$8Keb`E?! zp5x>fxY^UrMPCcz#arI-h#3;VNXK62`*A1s22&LEh)Y-MM7gZDI=p{)n75{; zI5a*E!2H;luGi~{gfKfht1Zi-)9LW)@#DCzOV4%r;lc%8Id+Wm^YhHi%!I!7rU86f zt8FQEs#?_(l?nhGUwkZ~5W3wijYb0@1h<<_Y}>{#3>?Q{`Q}Y*+on>f=()MMP}hz< z1FkGB0e@A@OGl2xmHby+*Cm_HQYaL#ZJSP~L%ZGP#e)a2Z5z`xky0`_Ik{!!{+-A( z;N0ocdgaEAjkk+emX`8SwYG!fIOK9UwAL&vEFgpcAP52gOw+_L45XBybR!3_TpVWT z=+nF~@hsPV{_()d;x7OU4Gugdn5N0-=qN%6eBVbYh39!Rn@zOV{R!aA zrDgqc`6K|YP&|KloQq$d<;}O>)t`U-ej-C~BY=^S5gf;1VkF>`%YqZnWjXVkq*N+l zSypJ>NC7OK{|3`A0l2=n0Ko6RUc_m)qR4FJWXb3A zG#rmiCc_uEiUdIrdH_O%7HF+pW{#PaLjl)LU;4!TV=-0C=1w$2|&!Fc1dNI&+E-?ZuyM(@11Vp?3&mb~CU>NQTYzE$rUwv2JgF z!0n#?T&i3d7O!C>(PfkH$P1@9n;i%Y4yI5fnie?WH~ zLe1!Za7am^c5#Y=i#WMBxKtMhuN?wG)Ka)k;i9=7Ceo57+G|XD_d0|mh=YCK_cTks z)7`y1&->x~JkR@H!nSRuspM35p8?DOW&l81CwRrOglQNwTP*+{luC)%0G0~{@wecs z*(~>qMQ$xF0`M-M7q)FnK_qle!WGLBp6^q0T}B({B_XtXpys;3#If583sUjQJ@B+# z7M|~qUY(ljo>9r84A97AF>}|rapyXpKWxo=&L;p&!;s3O)B}&J4Ka5!2SBeM0#JGJ zguR_A&mXNyHKCFN&f8a{k|_Z8oR0u}*{%?D+S0kC9aw+!UM$_c2SD@i`}lix<0SyQ zo3DAcX8oTjFfX3h3D*aRL()Ca_UhDI!&+aykRfwcY5K;JcHn35WBh#34TvH^6irU; z!Ex|!0pga@7zRf}7m}$oUwggZ)<)xbT4^~Dg(o`U`T%iAx&$H|FgQK}AUx^+vEJQp zO6AjXAeGh|L2ZCIq;wk=t%u{mKX>U00G)5ce*>9&Kp7xTO}zwD2lxesE0v!B_y1x5 O0000