From c9c59d0dd4ca06d1c8570d193d9547e19f1932b6 Mon Sep 17 00:00:00 2001 From: KasparoVy Date: Thu, 14 Jan 2016 03:25:31 -0500 Subject: [PATCH] Ward-Takahashi Prosthetics Ports Polaris' PRs 761 and 778. Awesome sprites by Ragnie. --- code/modules/organs/robolimbs.dm | 7 +++- html/changelogs/KasparoVy-PR-TBD.yml | 35 ++++++++++++++++++ .../human_races/cyberlimbs/wardtakahashi.dmi | Bin 0 -> 1028 bytes 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/KasparoVy-PR-TBD.yml create mode 100644 icons/mob/human_races/cyberlimbs/wardtakahashi.dmi diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index fc4151e4fef..ddb41ee3015 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -35,9 +35,14 @@ var/global/datum/robolimb/basic_robolimb company = "Xion Manufacturing Group" desc = "This limb has a minimalist black and red casing." icon = 'icons/mob/human_races/cyberlimbs/xion.dmi' - + /datum/robolimb/ipc company = "Morpheus Cyberkinetics" desc = "This limb is simple and functional; no effort has been made to make it look human." icon = 'icons/mob/human_races/cyberlimbs/ipc.dmi' unavailable_at_chargen = 1 + +/datum/robolimb/wardtakahashi + company = "Ward-Takahashi" + desc = "This limb features sleek black and white polymers." + icon = 'icons/mob/human_races/cyberlimbs/wardtakahashi.dmi' \ No newline at end of file diff --git a/html/changelogs/KasparoVy-PR-TBD.yml b/html/changelogs/KasparoVy-PR-TBD.yml new file mode 100644 index 00000000000..bec680e01d6 --- /dev/null +++ b/html/changelogs/KasparoVy-PR-TBD.yml @@ -0,0 +1,35 @@ +################################ +# 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. Remove the quotation mark and put in your name when copy+pasting the example changelog. +author: KasparoVy + +# 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: "Ports Polaris' PRs 761 and 778, brings over Ragnie's awesome Ward-Takahashi prosthetics." diff --git a/icons/mob/human_races/cyberlimbs/wardtakahashi.dmi b/icons/mob/human_races/cyberlimbs/wardtakahashi.dmi new file mode 100644 index 0000000000000000000000000000000000000000..01ded594a2c08e40e055c9c4e2a87a52b42ceeeb GIT binary patch literal 1028 zcmV+f1pE7mP)i_@%*Vor7Dk`k3tWQr*S65d;LPAtjR6#*Om6esiz`#b2^zr}z00DGTPE!Ct z=GbNc00549R9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM z;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3KBSC_b?$SBZ-=C9|j)q=}0&ttc@!6~s0~ zsLCNqRZ)CKVqOXnh7qN#C_X1Ooe0B-QB@S5mY-ijgkkuUDJ!`8xqt&108sU2dljV{ z$p8QX?ny*JRCt{2n!S$GKoo^-W)c!H1*@zOLMbQ^HNgo`xCq*?l?$Y7x-GKWNYEou zM@mD<1JEE|fS$%Ei4c+>3QJ4uxjzZc#z=@gU$f&ockUgJn{zT71ONa~k-L?H)r##cYm%QEZ%PFbyx$lP#2g^F>ER?FctZmGTy=~?3VZMm1{rB*|~`HfBy}6J$s?n z507_d9EtqdCRs4o+FMUNvg)t+k$wi13( z^A}!&2QSD}YtQ5TphoX}^(v}c00000007`0rO^AjA868`?+z*wZGQF-BTap`=q*UJ z|0TiVbJ1X~OdA?3va3^S{BL_@=U62{i(MOgB0^?WX9JgruNG%@HV9-jm)2R|{t%(t z^&ZhugiO6hl*k5Yo%L-dK5}$kX9KsC4dOZ*Oa>y<7^t`4*KME_(_#Ps008*^IikX& z(GxDpZW&(@cBqILvrC(BMHRjoeP7VVCx^y(*chi)~b3r1YK#=iV?LMmqL zX3{1pZNQ#`jLTW7_l0y`v4~sIf+1J)mLCz(`_d0|hb+L3DCApm;v4uG(hqb~7RYFW zws?b|yd&A7Xz*#s0tvO%CSwT+FA@7&aAW?FW41%?7)+efgp6M8<$9kSk@zhj;vbng zhDJ1@&ttCmiQbofV9e~mBx34)!Wu|*??>b;U%=`C000000B~cl$_+-JJPH?@vV2Eu zE^`<5)tcuAgSEfH#Al?#=$sprwU?jQqxQpP+~DLcET)zwBN^F}UvOkzzRMy}4*&oF y004j+gA=z%H8+Te9mo~F{FkJ|pmv}}h5rj?^?t^&7_t}u0000