mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-29 03:22:12 +00:00
Some Protean fixes
-Fixes protean regeneration not working at all. -Fixes not being able to get metal as blob. -Fixes unblobbing as custom size breaking vertical offset. -Adds a general use loadout fluff vest planned for a prottie char. -Fixes blobmob being slow due to mob update movement delays. -Gives protties trasheat verb.
This commit is contained in:
@@ -168,4 +168,8 @@ Swimsuits
|
|||||||
//Tron Siren outfit
|
//Tron Siren outfit
|
||||||
/datum/gear/uniform/siren
|
/datum/gear/uniform/siren
|
||||||
display_name = "jumpsuit, Siren"
|
display_name = "jumpsuit, Siren"
|
||||||
path = /obj/item/clothing/under/fluff/siren
|
path = /obj/item/clothing/under/fluff/siren
|
||||||
|
|
||||||
|
/datum/gear/uniform/suit/v_nanovest
|
||||||
|
display_name = "Varmacorp nanovest"
|
||||||
|
path = /obj/item/clothing/under/fluff/v_nanovest
|
||||||
@@ -36,6 +36,7 @@
|
|||||||
max_n2 = 0
|
max_n2 = 0
|
||||||
minbodytemp = 0
|
minbodytemp = 0
|
||||||
maxbodytemp = 900
|
maxbodytemp = 900
|
||||||
|
movement_cooldown = 0
|
||||||
|
|
||||||
var/mob/living/carbon/human/humanform
|
var/mob/living/carbon/human/humanform
|
||||||
var/obj/item/organ/internal/nano/refactory/refactory
|
var/obj/item/organ/internal/nano/refactory/refactory
|
||||||
@@ -200,7 +201,7 @@
|
|||||||
target.forceMove(vore_selected)
|
target.forceMove(vore_selected)
|
||||||
to_chat(target,"<span class='warning'>\The [src] quickly engulfs you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>")
|
to_chat(target,"<span class='warning'>\The [src] quickly engulfs you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>")
|
||||||
|
|
||||||
/mob/living/simple_mob/protean_blob/attack_hand(var/atom/A) //VORESTATION AI TEMPORARY REMOVAL (Marking this as such even though it was an edit.)
|
/mob/living/simple_mob/protean_blob/attack_target(var/atom/A)
|
||||||
if(refactory && istype(A,/obj/item/stack/material))
|
if(refactory && istype(A,/obj/item/stack/material))
|
||||||
var/obj/item/stack/material/S = A
|
var/obj/item/stack/material/S = A
|
||||||
var/substance = S.material.name
|
var/substance = S.material.name
|
||||||
@@ -346,8 +347,7 @@
|
|||||||
var/atom/reform_spot = blob.drop_location()
|
var/atom/reform_spot = blob.drop_location()
|
||||||
|
|
||||||
//Size update
|
//Size update
|
||||||
transform = matrix()*blob.size_multiplier
|
resize(blob.size_multiplier, FALSE)
|
||||||
size_multiplier = blob.size_multiplier
|
|
||||||
|
|
||||||
//Move them back where the blob was
|
//Move them back where the blob was
|
||||||
forceMove(reform_spot)
|
forceMove(reform_spot)
|
||||||
|
|||||||
@@ -96,7 +96,8 @@
|
|||||||
/mob/living/carbon/human/proc/shapeshifter_select_gender,
|
/mob/living/carbon/human/proc/shapeshifter_select_gender,
|
||||||
/mob/living/carbon/human/proc/shapeshifter_select_wings,
|
/mob/living/carbon/human/proc/shapeshifter_select_wings,
|
||||||
/mob/living/carbon/human/proc/shapeshifter_select_tail,
|
/mob/living/carbon/human/proc/shapeshifter_select_tail,
|
||||||
/mob/living/carbon/human/proc/shapeshifter_select_ears
|
/mob/living/carbon/human/proc/shapeshifter_select_ears,
|
||||||
|
/mob/living/proc/eat_trash
|
||||||
)
|
)
|
||||||
|
|
||||||
var/global/list/abilities = list()
|
var/global/list/abilities = list()
|
||||||
@@ -296,7 +297,6 @@
|
|||||||
material_name = MAT_STEEL
|
material_name = MAT_STEEL
|
||||||
|
|
||||||
/datum/modifier/protean/steel/tick()
|
/datum/modifier/protean/steel/tick()
|
||||||
..()
|
|
||||||
holder.adjustBruteLoss(-10,include_robo = TRUE) //Looks high, but these ARE modified by species resistances, so this is really 20% of this
|
holder.adjustBruteLoss(-10,include_robo = TRUE) //Looks high, but these ARE modified by species resistances, so this is really 20% of this
|
||||||
holder.adjustFireLoss(-1,include_robo = TRUE) //And this is really double this
|
holder.adjustFireLoss(-1,include_robo = TRUE) //And this is really double this
|
||||||
var/mob/living/carbon/human/H = holder
|
var/mob/living/carbon/human/H = holder
|
||||||
|
|||||||
@@ -1520,6 +1520,14 @@ Departamental Swimsuits, for general use
|
|||||||
icon_override = 'icons/vore/custom_clothes_vr.dmi'
|
icon_override = 'icons/vore/custom_clothes_vr.dmi'
|
||||||
item_state = "gnshorts"
|
item_state = "gnshorts"
|
||||||
|
|
||||||
|
/obj/item/clothing/under/fluff/v_nanovest
|
||||||
|
name = "Varmacorp nanovest"
|
||||||
|
desc = "A nifty little vest optimized for nanite contact."
|
||||||
|
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||||
|
icon_state = "nanovest"
|
||||||
|
icon_override = 'icons/vore/custom_clothes_vr.dmi'
|
||||||
|
item_state = "nanovest"
|
||||||
|
|
||||||
//General use
|
//General use
|
||||||
/obj/item/clothing/suit/storage/fluff/loincloth
|
/obj/item/clothing/suit/storage/fluff/loincloth
|
||||||
name = "Loincloth"
|
name = "Loincloth"
|
||||||
@@ -1906,4 +1914,4 @@ Departamental Swimsuits, for general use
|
|||||||
return 1
|
return 1
|
||||||
|
|
||||||
/obj/item/clothing/under/fluff/slime_skeleton/digest_act(var/atom/movable/item_storage = null)
|
/obj/item/clothing/under/fluff/slime_skeleton/digest_act(var/atom/movable/item_storage = null)
|
||||||
return FALSE //Indigestible
|
return FALSE //Indigestible
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 204 KiB After Width: | Height: | Size: 206 KiB |
Reference in New Issue
Block a user