From 4eaaa168a3a3f571e872d7b0d10819bf300e1b07 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Sun, 5 Feb 2017 21:59:21 -0600 Subject: [PATCH] Replaces the limb grower with surplus limbs --- .../map_files/Deltastation/DeltaStation2.dmm | 2 +- _maps/map_files/MetaStation/MetaStation.dmm | 2 +- _maps/map_files/OmegaStation/OmegaStation.dmm | 2 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 2 +- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 2 +- .../structures/crates_lockers/crates.dm | 15 +++++++++ code/modules/surgery/bodyparts/bodyparts.dm | 4 +-- .../surgery/bodyparts/robot_bodyparts.dm | 31 ++++++++++++++++++ icons/mob/augments.dmi | Bin 1692 -> 2636 bytes 9 files changed, 53 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 5c3d0fba964..780693285f5 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -95145,7 +95145,7 @@ }, /area/medical/genetics_cloning) "dmX" = ( -/obj/machinery/limbgrower, +/obj/structure/closet/crate/freezer/surplus_limbs, /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index b3158efcf77..160a7eba578 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -62599,7 +62599,7 @@ network = list("SS13","Medbay") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/limbgrower, +/obj/structure/closet/crate/freezer/surplus_limbs, /obj/item/weapon/reagent_containers/glass/beaker/synthflesh, /turf/open/floor/plasteel/whiteblue/side{ dir = 4 diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index fb46b6ee541..aa81b6d543e 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -29861,7 +29861,7 @@ pixel_x = -24; pixel_y = -24 }, -/obj/machinery/limbgrower, +/obj/structure/closet/crate/freezer/surplus_limbs, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 19187c49c5e..49ac9e5279e 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -39521,7 +39521,7 @@ }, /area/medical/medbay) "bAd" = ( -/obj/machinery/limbgrower, +/obj/structure/closet/crate/freezer/surplus_limbs, /obj/item/weapon/reagent_containers/glass/beaker/synthflesh, /obj/machinery/newscaster/security_unit{ pixel_y = 32 diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index ca42d33a265..4c5034828da 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -38749,7 +38749,7 @@ /turf/open/floor/plasteel/white, /area/medical/sleeper) "bGS" = ( -/obj/machinery/limbgrower, +/obj/structure/closet/crate/freezer/surplus_limbs, /obj/item/weapon/reagent_containers/glass/beaker/synthflesh, /turf/open/floor/plasteel/white, /area/medical/sleeper) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 62fee1a1c1c..f80d2bba612 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -98,6 +98,21 @@ for(var/i in 1 to 3) new /obj/item/weapon/reagent_containers/blood/random(src) +/obj/structure/closet/crate/freezer/surplus_limbs + name = "surplus prosthetic limbs" + desc = "A crate containing an assortment of cheap prosthetic limbs." + +/obj/structure/closet/crate/freezer/surplus_limbs/New() + . = ..() + new /obj/item/bodypart/l_arm/robot/surplus(src) + new /obj/item/bodypart/l_arm/robot/surplus(src) + new /obj/item/bodypart/r_arm/robot/surplus(src) + new /obj/item/bodypart/r_arm/robot/surplus(src) + new /obj/item/bodypart/l_leg/robot/surplus(src) + new /obj/item/bodypart/l_leg/robot/surplus(src) + new /obj/item/bodypart/r_leg/robot/surplus(src) + new /obj/item/bodypart/r_leg/robot/surplus(src) + /obj/structure/closet/crate/radiation desc = "A crate with a radiation sign on it." name = "radiation crate" diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index 979f2623f41..a5545c91cd7 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -316,9 +316,9 @@ I = image("icon"='icons/mob/human_parts.dmi', "icon_state"="[species_id]_[body_zone]", "layer"=-BODYPARTS_LAYER, "dir"=image_dir) else if(should_draw_gender) - I = image("icon"='icons/mob/augments.dmi', "icon_state"="[body_zone]_[icon_gender]", "layer"=-BODYPARTS_LAYER, "dir"=image_dir) + I = image("icon"='icons/mob/augments.dmi', "icon_state"="[icon_state]_[icon_gender]", "layer"=-BODYPARTS_LAYER, "dir"=image_dir) else - I = image("icon"='icons/mob/augments.dmi', "icon_state"="[body_zone]", "layer"=-BODYPARTS_LAYER, "dir"=image_dir) + I = image("icon"='icons/mob/augments.dmi', "icon_state"="[icon_state]", "layer"=-BODYPARTS_LAYER, "dir"=image_dir) standing += I return standing diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm index 6d0001c4211..653a1311446 100644 --- a/code/modules/surgery/bodyparts/robot_bodyparts.dm +++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm @@ -158,3 +158,34 @@ flash2.forceMove(user.loc) flash2 = null ..() + + + + +/obj/item/bodypart/l_arm/robot/surplus + name = "surplus prosthetic left arm" + desc = "A skeletal, robotic limb. Outdated and fragile, but it's still better than nothing." + icon = 'icons/mob/augments.dmi' + icon_state = "surplus_l_arm" + max_damage = 20 + +/obj/item/bodypart/r_arm/robot/surplus + name = "surplus prosthetic right arm" + desc = "A skeletal, robotic limb. Outdated and fragile, but it's still better than nothing." + icon = 'icons/mob/augments.dmi' + icon_state = "surplus_r_arm" + max_damage = 20 + +/obj/item/bodypart/l_leg/robot/surplus + name = "surplus prosthetic leg" + desc = "A skeletal, robotic limb. Outdated and fragile, but it's still better than nothing." + icon = 'icons/mob/augments.dmi' + icon_state = "surplus_l_leg" + max_damage = 20 + +/obj/item/bodypart/r_leg/robot/surplus + name = "surplus prosthetic leg" + desc = "A skeletal, robotic limb. Outdated and fragile, but it's still better than nothing." + icon = 'icons/mob/augments.dmi' + icon_state = "surplus_r_leg" + max_damage = 20 \ No newline at end of file diff --git a/icons/mob/augments.dmi b/icons/mob/augments.dmi index 7124c35105e4648e334b6db31725f5cb968d24fc..a2d816c8c98016a80f72db0382e59cf1b5fc6363 100644 GIT binary patch delta 2622 zcmX|DdpOgJ8{dXADO7gQsHG0MOjP6-3!yUPGICeS<=B=qms}R##X$*`+uZMBB%xfw zwkVE?MIzU6+$|=WOWXMAoadbPkN5Mw&+|U-`+PosyziSW{sE@=(Ax5{xENdv1Okbp zO-(Q$5O_BPgG7aP0sq|5ZWlbBDyjiWN=m!o6yz6gZ*NsqRU;!K2L}f`J3DDeQyoO4 z5F#895FiC9JaOWLzP>&ZiG;)9+S=L>2!u|j=U(VQ{OlTtv9tvl&VKRUO{&A}90N_f z0zCY&cLK3~w?Uwg?1UtySgYo~Smu&#%F@a0rm&~tLvLG*RL;8W1#*&$KMe-w{7H}M zR==-teKR^`(e-+!{nf!s`ryvT!9kdgZu>ZLeQ$U74UK3aR?{X{Ia4&iX;j|2-&i4< zYl^jqljsIf#s&UvX#ws?<9c_C5!qYP`-a^k)N0D|g}(2Ti8TX<)OTaFCXZVbhbmCD zIGPn%Qn;X<0`sf&z~|K@KYA|RmopV!2Lg!>qfIW@g=8<~h?7%v_r;(MWbI3O$YGz^ z+?}1SEc(1nDY{ES?INoqhns!HM_0l3zVN*6F6~`=lb9Xs`M@~-6byDG$q&y$uki_S zsP%Bfrqt(kBB#an{b-~|^fmTd-Sw#3RCc5n?NP2Az#�at}qBxE%@W_#^+WX3SA| zOJB$9ulQM~wpSXw*z?ahtr#e!bfU02)?^lfZF0x+6m(^B_!t!I7&Lt&v*Ebdw5QI( z;g#NM3{}Wwgsc+TMmETdYKWDO95pC`PMcnOsV^2qzG1nD3a+g(yFRS{$n)TF?RPPh zsHho$p0D?^%({j(_LZDDIGr3@Dd7)w#GNCxuyd9{3;H|rMEVu6Yr%B*x;iv{y-^5- z+AOj(g0(4_v_yT9I4$j*ITI#)3s0MxRLHvgnUv*yBV4p&kH9)+^m&1Ll-$UiXizgW z8{P_g=4BRiH1wKhXl}0_{Y*-kPc72V>^V@I8cra^A1e|rL%9@qvTh3qynpoPSEeMsFAA&C zH!ewzj=UGZqv}ZQ?KLwuxB)qoT*29OWVcHV|R4;|~uZG4wH9lNJ;A?G6ZboQ7 zRfhLN2e$LBtgFZ~H*!4cOKix4w++jd{@si>N+-y#zT+b*z6@5$b}A}%QC-iZ?zf53 zY>?f|i|D-g0uR-LL=uLwpmeDnV*j>nRi~5ZP@Zk?DME9`#`_c=*vI&7qji0600~QrY*kdL8O%uH+we+)mTlPo(E86$SSf6; z@XlE~C{H{Y@MxMDCiJMuZEa9o$CcfWHjzAPZcNYBD{U?qXdAfMwjRFwOvY+dRBpz1w1B>6>?hTF5g% zvzanJ?oZD*fD|8|rzUG5=j#uF&EdoG78lq!?H9^vBL4{h0*#h+wY<)|7ICs#$xptB zBY8=rEiuQID`@IL^b0q6u9#oFxnxwm$g?_-k7{y^dv}*7(8CDvWPa;e>l6vY(Y_mc z*=(Orrsa*~r}}Toy+mSx+`(Devd+>gP=l(lo~M$0XIBpVgy*IQ>w9?fc82~9w2E$tOCUDjMs^v&bf(B3}(UP;wwmgsR%yR&ok2kEQB*UQlWR4fDF{MF>^d*1dc>^r$% z3vvu}V1;~{9$1%?`b3p7NWpq|WFu#WY%BGN$KPw1)il0%CqxgCa*zvA7Y>nx7{C zL^4Qbs9tsfmKqnfq{~bVtZ-=qFFvhRs|Me0#Lg{j#qo(3eqwoZ2IbXSzw5>I&mYE@ z_0K&LH5BHL9kAYL);-fkWq(I?!j~Ah-UUjuTj^XWNZFtUBUZvaCS5%D^WcE!`jY`} zY{wi3qRTm${IK=-Y64-EyIGWT04-wwlF^9UY=nwa1AbfRs}VqYh(|peTftoxLJg1sA*a>=2`;7JFe+_0623@AMO0 zV?WrzKFxEcEe7eW@ir8S8gh}S59!+)E%#rTYX;&Os2Ac>fjnRz8X4q|LhF+U) zA>d`ul~rBd_8|v8B(jm@K!)B#CPI#NR_%3{#1ora|08+vi>xC30oh_J@J$6D@%SR{ z%EP=vuY5Wm$K$3A)nzaH-^hK>)nRl8JeVPcCUr7mL=ISUDoRq8hg8OrKK;tbc=YqT z_}56R$4P}{J*<)D@RhzLzlp#PK?MHX8#DGok}p-UPkXQ}P~F>p(HU{FTW=z}v(L3J z^e{9Y3;2wIhxojr#tnp=b4RiU`YgmA_e0RMhJ3b}xTNKPYz8)KqHdZnV z^Q=7BOfaS48ZXpIKtnDWy#;-jxKiI*&6peEk$=w!4j(SzYP7g)~DEC4oG z=*{wnG|Rt!4;24b%fE5cxO$cIo-Y_*Ta&u9-I7jYg+@duIULnWj`K3oV=|ee$Pk;&X^pGbAoY+2*;|9A>$JR1nk&7&2}veYnaUJny6HZO1}9tcj) a+d+)=Uf$RbI>aXZoQJ+>Y4XCzJ@Wtb*%Rvk delta 1655 zcmV--28j906r2quiBL{Q4GJ0x0000DNk~Le0002s0002s1Oos70O$jE(f|MeDv>2C z7{I{5?QQs=00001bW%=J06^y0W&i*HoROgue^XX)a&`CgQ*iP1qPQ1>5r#=C za*7Xo!vPAI^?Orn&n76KKkLJUf3ER*(MP`|Veu4pphIzwaKdQ|Hs~B*d~=B1Lcg_v zD*hqP0_;HJ6*b8PK@f!h1N67i++e%asCeGR*$A8yyEi_3h2*EqWzt!cP;N;u57a8AM`P0^}te;Hrn5k8=0 zVmN+&u8g;s5Am`tjT2aA_aRf3A+V2p0=%f55h$Z-0dL`S=RmBQD<3Zx(dP z(86mFYIE`XIlL?LtBnxrz4{?~uYrVE@6`|0d$ki{z1KiOtoQ1N=)L+Odar(n-m4#? z_Zmou^>Rfb`u>>kM^ZnUnr#6kn1szJ7-GZ$$6C4+5z7Y=Ih2aD(BXIw7a`CNF=7=BU72 zq5a=IINn0f={>xvyk}Hk>IwA-tt%Ks^O^ z0{y4k)yw)8GXpPee|&dn@7t2@YqLB!sHe&Ss$c$O^9A2T|Fw6-ALu`|tZeaB!c84U zc*GxER!^17`d0}zWey3;{lR76T!tQ%evB^yb$7%c>c1846MYNdZTLQo8qm+%iI)w zPCb8kI*#WLxq3CeVe8fShO1ZOKOs}E#yecS8t-uRe{Q_P)w`)7VRgM4{|T9THU1Ma z^=bmXUkhsZZ)1u0E-Exca326EgKl{U_w=lX_3c)F<_ykf~4VKOs|} z)H_^#EmH4r^-29FWa^XphpA8MAGSWJAP8@We*wNgKXAxpRIva6002ovPDHLkV1f&| BB1!-N