From 59adbae59ef65d55ed401239d8b84292612cdf84 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 27 Mar 2015 16:41:32 +1030 Subject: [PATCH] Removes the vox armalis. --- code/datums/mind.dm | 9 +-- code/modules/clothing/spacesuits/alien.dm | 27 +++------ .../mob/living/carbon/human/human_species.dm | 4 -- .../carbon/human/species/outsider/vox.dm | 41 ------------- code/modules/projectiles/guns/alien.dm | 55 +----------------- icons/mob/species/armalis/feet.dmi | Bin 369 -> 0 bytes icons/mob/species/armalis/gloves.dmi | Bin 377 -> 0 bytes icons/mob/species/armalis/head.dmi | Bin 385 -> 0 bytes icons/mob/species/armalis/held.dmi | Bin 996 -> 0 bytes icons/mob/species/armalis/mask.dmi | 0 icons/mob/species/armalis/suit.dmi | Bin 2665 -> 0 bytes 11 files changed, 9 insertions(+), 127 deletions(-) delete mode 100644 icons/mob/species/armalis/feet.dmi delete mode 100644 icons/mob/species/armalis/gloves.dmi delete mode 100644 icons/mob/species/armalis/head.dmi delete mode 100644 icons/mob/species/armalis/held.dmi delete mode 100644 icons/mob/species/armalis/mask.dmi delete mode 100644 icons/mob/species/armalis/suit.dmi diff --git a/code/datums/mind.dm b/code/datums/mind.dm index de544cc9ae..9c1dfbab0f 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -72,7 +72,7 @@ datum/mind current.remove_changeling_powers() current.verbs -= /datum/changeling/proc/EvolutionMenu current.mind = null - + nanomanager.user_transferred(current, new_character) // transfer active NanoUI instances to new user if(new_character.mind) //remove any mind currently in our new body's mind variable new_character.mind.current = null @@ -1289,10 +1289,3 @@ datum/mind ..() mind.assigned_role = "Juggernaut" mind.special_role = "Cultist" - -/mob/living/simple_animal/vox/armalis/mind_initialize() - ..() - mind.assigned_role = "Armalis" - mind.special_role = "Vox Raider" - - diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index 1436e4e4a2..23ba1d0c55 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -45,21 +45,15 @@ siemens_coefficient = 0.6 heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE - species_restricted = list("Vox", "Vox Armalis") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/suit.dmi', - ) + species_restricted = list("Vox") + sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') /obj/item/clothing/head/helmet/space/vox armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30) siemens_coefficient = 0.6 flags = HEADCOVERSEYES|STOPPRESSUREDAMAGE - species_restricted = list("Vox","Vox Armalis") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/head.dmi', - ) + species_restricted = list("Vox") + sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi') /obj/item/clothing/head/helmet/space/vox/pressure name = "alien helmet" @@ -137,22 +131,15 @@ siemens_coefficient = 0 permeability_coefficient = 0.05 item_color = "gloves-vox" - species_restricted = list("Vox","Vox Armalis") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/gloves.dmi', - ) + species_restricted = list("Vox") + sprite_sheets = list("Vox" = 'icons/mob/species/vox/gloves.dmi') /obj/item/clothing/shoes/magboots/vox desc = "A pair of heavy, jagged armoured foot pieces, seemingly suitable for a velociraptor." name = "vox magclaws" item_state = "boots-vox" icon_state = "boots-vox" - - species_restricted = list("Vox","Vox Armalis") - sprite_sheets = list( - "Vox Armalis" = 'icons/mob/species/armalis/feet.dmi' - ) + species_restricted = list("Vox") action_button_name = "Toggle the magclaws" diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm index 051ef214f4..50f575228e 100644 --- a/code/modules/mob/living/carbon/human/human_species.dm +++ b/code/modules/mob/living/carbon/human/human_species.dm @@ -22,10 +22,6 @@ h_style = "Short Vox Quills" ..(new_loc, "Vox") -/mob/living/carbon/human/voxarmalis/New(var/new_loc) - h_style = "Bald" - ..(new_loc, "Vox Armalis") - /mob/living/carbon/human/diona/New(var/new_loc) ..(new_loc, "Diona") diff --git a/code/modules/mob/living/carbon/human/species/outsider/vox.dm b/code/modules/mob/living/carbon/human/species/outsider/vox.dm index bf007450e3..ff99a53995 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/vox.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/vox.dm @@ -54,44 +54,3 @@ /datum/species/vox/get_random_name(var/gender) var/datum/language/species_language = all_languages[default_language] return species_language.get_random_name(gender) - -/datum/species/vox/armalis - name = "Vox Armalis" - name_plural = "Vox" - icobase = 'icons/mob/human_races/r_armalis.dmi' - deform = 'icons/mob/human_races/r_armalis.dmi' - rarity_value = 10 - - warning_low_pressure = 50 - hazard_low_pressure = 0 - - cold_level_1 = 80 - cold_level_2 = 50 - cold_level_3 = 0 - - heat_level_1 = 2000 - heat_level_2 = 3000 - heat_level_3 = 4000 - - brute_mod = 0.2 - burn_mod = 0.2 - - eyes = "blank_eyes" - breath_type = "nitrogen" - poison_type = "oxygen" - - flags = IS_RESTRICTED | NO_SCAN | NO_BLOOD | NO_PAIN | HAS_EYE_COLOR - - blood_color = "#2299FC" - flesh_color = "#808D11" - - tail = "armalis_tail" - icon_template = 'icons/mob/human_races/r_armalis.dmi' - - reagent_tag = IS_VOX - - inherent_verbs = list( - /mob/living/carbon/human/proc/leap, - /mob/living/carbon/human/proc/gut, - /mob/living/carbon/human/proc/commune - ) \ No newline at end of file diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index 797d0b07c2..0f0a64a27f 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -39,7 +39,7 @@ /obj/item/weapon/gun/launcher/spikethrower/special_check(user) if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user - if(H.species && H.species.name != "Vox" && H.species.name != "Vox Armalis") + if(H.species && H.species.name != "Vox") user << "\The [src] does not respond to you!" return 0 return ..() @@ -51,56 +51,3 @@ if(spikes < 1) return null spikes-- return new /obj/item/weapon/spike(src) - -//This gun only functions for armalis. The on-sprite is too huge to render properly on other sprites. -/obj/item/weapon/gun/energy/noisecannon - name = "alien heavy cannon" - desc = "It's some kind of enormous alien weapon, as long as a man is tall." - - icon = 'icons/obj/gun.dmi' //Actual on-sprite is handled by icon_override. - icon_state = "noisecannon" - item_state = "noisecannon" - recoil = 1 - - force = 10 - projectile_type = /obj/item/projectile/energy/sonic - cell_type = /obj/item/weapon/cell/super - fire_delay = 40 - fire_sound = 'sound/effects/basscannon.ogg' - - var/mode = 1 - - sprite_sheets = list( - "Vox Armalis" = 'icons/mob/species/armalis/held.dmi' - ) - -/obj/item/weapon/gun/energy/noisecannon/attack_hand(mob/user as mob) - if(loc != user) - var/mob/living/carbon/human/H = user - if(istype(H)) - if(H.species.name == "Vox Armalis") - ..() - return - user << "\The [src] is far too large for you to pick up." - return - -/obj/item/weapon/gun/energy/noisecannon/update_icon() - return - -//Projectile. -/obj/item/projectile/energy/sonic - name = "distortion" - icon = 'icons/obj/machines/particle_accelerator2.dmi' - icon_state = "particle" - damage = 60 - damage_type = BRUTE - check_armour = "bullet" - pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE - - embed = 0 - weaken = 5 - stun = 5 - -/obj/item/projectile/energy/sonic/proc/split() - //TODO: create two more projectiles to either side of this one, fire at targets to the side of target turf. - return diff --git a/icons/mob/species/armalis/feet.dmi b/icons/mob/species/armalis/feet.dmi deleted file mode 100644 index cbd83be702716aaef2c511953c3f39dd4f060e62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmV-%0gnEOP)NI+8rBy0cx00DGTPE!Ct=GbNc003}$R9JLGWpiV4X>fFDZ*Bkp zc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfF@*23*A@ zi6yB(rczRVeo3)zS$>5Q7iUUlQ87rGi!-e#F*g;&Hsn%PaP@Nm8w~)vI2*pEyJ+eF z005CmL_t(YiS3lZ4TCTYMZeYb9s(Tzg$~fF0{|flpzc3QF9`WVpyKW)CDMz2Y@ZAm zhGCrH*Q@N1m{O~~fvc!Q$fN#%2kxE&i316@Uc1E1Ejl>u2$e|i+CdIk&XF62VH_g< z&l@eMh48r&$gh2%{_1|E3bf_s-IVg=&Dw4fLL&gfdox8H8*(@GC_nrF4$=z8hvjiR P00000NkvXXu0mjfErpQh diff --git a/icons/mob/species/armalis/gloves.dmi b/icons/mob/species/armalis/gloves.dmi deleted file mode 100644 index 7d3eed317af3719430912d8b8316c609c9717e90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^4nQ2h!VDy%C+3v_DWL$L5Z40-4k%a{7z6}pXlPhO zL}++8+~Re84U}ap3GxeOaCmkj4ah013W+FjNi9w;$}A|!%+F(BsF)KRR!~&>{Y!Ac z$FEPcymhtCojD)8A=Kca@q TMNxNvZe;Lu^>bP0l+XkKz$1l( diff --git a/icons/mob/species/armalis/head.dmi b/icons/mob/species/armalis/head.dmi deleted file mode 100644 index ddb8859fd0d70eb270bd02fff328513f43e41c69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^4nQ2h!VDy%C+3v_DbWC*5Z40-4yYSSDOea-L_}z4 zXczh}Dqt)L@(X5gcy=QV$SJN0i70VNElw`VEGWs$&tqVym=hdUP*nQ; zOK`!*uTQkRb+yi&IUl?s)Zn7=gGV~&eKb!p6!rA(urLlXzHIE}V8j-4RJBuerNgqI z$hy|NqNKni$E2cFLgMLOX@Q0wtm5fWfk}B<9l0l#u6gk4Ig^hqpKLZW8+zu{a(<@+NFDPSpRxEtylg>#6)-*l~(H*SJz2%0!2QwX3adtCz zHy2CjDL0tyU|`I%j=19#(>ujECb+=rknW9>9+9lur5)@-f|!1biWej#1WD+Aa670W cA;-Y*d4lk_$KfH2KxZ;|y85}Sb4q9e0BeYZL;wH) diff --git a/icons/mob/species/armalis/held.dmi b/icons/mob/species/armalis/held.dmi deleted file mode 100644 index 517709f33c47cad8f1c4f42d06d082e34829ca53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 996 zcmVV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pyG6r15C5a`eK&Db&er9oMa$;UyeqMZ$5*KGmW>GOn2^VKtQDSZ?h;4{nbq+4o z$_lQ2E?~z104LrnfZUZ5eE>f!X?HMX6^@srR2iPBu?WDwZJaj?g0P09}s(AeTJY$bv2)WqB{t;XJQCDxEemuas zsYqozD{z29IzU%r-7hKyFwb&q{){OHR%M98tW|BEbqGSyVcrjePKcTqxw6tWPjYXBq#H|y4w(lYVqu`o7Ry52 z3;@7xgf)u^Mt_lo)oBp0)*?_E|L55?2Cy1q56jY+hni^fXo~@u35GAmnF`D~=SL(7 z1S)fJY+NdxS$+`~Ua+>9Jk~?@^4MPVafJX-i-DxjXB8S@`xRKh=nIZXK`*w5E8A}s zA^=d?R2h#YBGjU_{UVe>Veb(5UdwQm@g}wX5;O*_v&EJw5mf9QzYJXhbEXPEOS17B z_h?^zcrF7fw@H16B@Hc+bVSyi(v9_}a9qKDw8I6PFJr9>rEc`+&C-c6=guaOtCG4vZmUGy1}1zRUF-*~c8TbUxd(bkE3FH50fKoH$HqXyMG?|9f8)B_Xm*P~9H2CxU{ zbs?r3XQNJ>WN-l9yw?mc%{1ynKY>$$L3QJ(6a54TEOh)UOgm#b(O}TW0Qa`$hFzDv Sq+(P600006X za$-?pL1J>M5*KGmW>GOn1s7*pQDSZ?h;4{aoLH2bn3GwIOP#WUtDg(l6#%(wC{Zkn zs5}4w2)0Q?K~!jg?O1((+BO&UyJZlN)FItk6Sl_%t%EJmy4BraNt?p<{lC$3?lqyo zx`L$pZ@h%cMV##?NkZlmNr8kYV1kc98a-GDBVhx;_XI_p?L&Uq`~w9XgO5SF z7bglu0%6=TNMaEu17Q@!KJ)F2IEq4fMw&b@fc?a^kcN+NnL(VA{iBW+5`$DCkmBRk z0@lY$T?@cqw_Su^%LL-cz4g!vO_2%EzHvMe{-&;h^ouU6m3TDzD41$BCdN5+rKJg~9V7GIR0ADiY$>DR9gu)b;Z=n+e{AH#)JZ^}+ zQx2d%9)8Ke|1N>(sSF}HjZk>Sh_E>J5{OZVlfZ+MdnLyTK|81(dR+B{0wF^I2O<>J(e zfI-|c@K8uv`>G=W^*cYi|tc)0J*4bdqy4 z?;cr@XIdc~QPN_u;C~ z3iRb2sD3sck4Xdk8;^#UFJE4?$i>T-m%|Z#O8dvZtS_yggKu7Z`|9Cxv4IHxOnsS$3+ks8qB{*OHRR3K6v^4>HYTp-TU8q z=3FFju6m%LRbNRsDNxO-nVl+gHe!_)3oM79#e(G71w>rs zV^z&72waXI2m0PV2jjTJAz_*t=MDi=+SR%kd>9n#l@%;7&I*XQ%ErpTzBN|XuU!N% z7#KBn6)=_=6l`BugmG3t#8rN#-~)DIJO{Yjg_*z$lsa=1p!LmqMc1E3u+ZX6K*Uu> zK4>#FJz^irOjSkS;*1v@YD|@>(uEs6SMiU3UM)!C3xA@(^e?))}eW$?w{ow+i8-PzxKxfV8 z?)t681`U|E;;)|T~>-$}UA zxmGfsQ4wlRQ6TdT6(x@Xh%ZFDq(FVDq-Tf&!}BS7A?f$vJ4X zURqHB;Hu7RCE|gC0;QeUs%aWexz~UyOevv&dw-^ky#s^Q`pz0j0n2#CxOFpWHN8T` zN205OKx6>>n1xh{ZsBTLxv)aDxko0vN3D?*K=!F^nU@xx(v4CQU{fK@Bh}KMq-x`)i!Ihg1g$Qa6*uVG;s3Q^RJ?x>KP;LIQZpP$#TQ6(58WUdEtUz50I8rQv>+g>@A7R3i4dJA7 zO!ylCE2V5YrRhGo6qtYWW}JlZ3cz!`8!)%$Y<9sZty&UoY;WNI z2BKKw6xY)JDF*TA@iYQ>Z1F^5F@T>OBf$M|7r)^MsCMP%2?VH+R2&H%3PsjK1oSc= z0}(gyKZ~c{fF8cCpTMBG<_9-CMI$dC_$yoh>ji<&34A!kUi*p|oao8a&OTE(43}-u z9zPtRkaGDcJm4>Bv~D~guhD4j`+{b>?FD*U1jSYdy{%A;PT(yA46zjM)