diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm index c192ef6b81..507fe07f34 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm @@ -323,9 +323,10 @@ to_chat(P,"You can only do this while not stunned.") else if(P.l_hand) - drop_from_inventory(P.l_hand) + P.drop_from_inventory(P.l_hand) if(P.r_hand) - drop_from_inventory(P.r_hand) + P.drop_from_inventory(P.r_hand) + P.has_hands = 0 S.OurRig.myprotean = P src.drop_from_inventory(S.OurRig) P.forceMove(S.OurRig) @@ -334,55 +335,6 @@ to_chat(temporary_form, "Somehow, your RIG got disconnected from your species. A new one has been created for you, contact a coder.") new /obj/item/weapon/rig/protean(src,src) -//// -// Change size -//// -/*CHOMP Removal start - I am replacing this with the OG set size. No more metal requirement. -/mob/living/carbon/human/proc/nano_set_size() - set name = "Adjust Volume" - set category = "Abilities" - set hidden = 1 - - var/mob/living/user = temporary_form || src - - var/obj/item/organ/internal/nano/refactory/refactory = nano_get_refactory() - //Missing the organ that does this - if(!istype(refactory)) - to_chat(user,"You don't have a working refactory module!") - return - - var/nagmessage = "Adjust your mass to be a size between 25 to 200% (or between 1 to 600% in dorms area). Up-sizing consumes metal, downsizing returns metal." - var/new_size = input(user, nagmessage, "Pick a Size", user.size_multiplier*100) as num|null - if(!new_size || !size_range_check(new_size)) - return - - var/size_factor = new_size/100 - - //Will be: -1.75 for 200->25, and 1.75 for 25->200 - var/sizediff = size_factor - user.size_multiplier - - //Negative if shrinking, positive if growing - //Will be (PLSC*2)*-1.75 to 1.75 - //For 2000 PLSC that's -7000 to 7000 - var/cost = (PER_LIMB_STEEL_COST*2)*sizediff - - //Sizing up - if(cost > 0) - if(refactory.use_stored_material(MAT_STEEL,cost)) - user.resize(size_factor, ignore_prefs = 1) - else - to_chat(user,"That size change would cost [cost] steel, which you don't have.") - //Sizing down (or not at all) - else if(cost <= 0) - cost = abs(cost) - var/actually_added = refactory.add_stored_material(MAT_STEEL,cost) - user.resize(size_factor, ignore_prefs = 1) - if(actually_added != cost) - to_chat(user,"Unfortunately, [cost-actually_added] steel was lost due to lack of storage space.") - - user.visible_message("Black mist swirls around [user] as they change size.") -CHOMP Removal end*/ - /mob/living/carbon/human/proc/appearance_switch() set name = "Switch Blob Appearance" set desc = "Allows a protean blob to switch its outwards appearance." diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm index db0bb7cffb..796db01e43 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm @@ -52,6 +52,9 @@ rarity_value = 5 + female_scream_sound = 'modular_chomp/sound/voice/scream_silicon.ogg' + male_scream_sound = 'modular_chomp/sound/voice/scream_silicon.ogg' + crit_mod = 4 //Unable to go crit var/obj/item/weapon/rig/protean/OurRig diff --git a/modular_chomp/sound/voice/android_scream.ogg b/modular_chomp/sound/voice/android_scream.ogg new file mode 100644 index 0000000000..d3f179a84a Binary files /dev/null and b/modular_chomp/sound/voice/android_scream.ogg differ diff --git a/modular_chomp/sound/voice/borg_deathsound.ogg b/modular_chomp/sound/voice/borg_deathsound.ogg new file mode 100644 index 0000000000..bb11022abe Binary files /dev/null and b/modular_chomp/sound/voice/borg_deathsound.ogg differ diff --git a/modular_chomp/sound/voice/scream_silicon.ogg b/modular_chomp/sound/voice/scream_silicon.ogg index 0b3f47370a..a58c72b8ab 100644 Binary files a/modular_chomp/sound/voice/scream_silicon.ogg and b/modular_chomp/sound/voice/scream_silicon.ogg differ