cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-09 00:43:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

protean - few runtime/bug fixes, tesh suit sprites, digi suit sprites

Browse Source
This commit is contained in:
Seris02
2023-02-09 16:45:26 +08:00
parent 369e1bdcc5
commit 260488f924
7 changed files with 9 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm
View File

@@ -29,7 +29,7 @@
to_chat(caller,"<span class='warning'>You don't have a working refactory module!</span>")
return
var/choice = tgui_input_list(src,"Pick the bodypart to change:", "Refactor - One Bodypart", species.has_limbs)
var/choice = tgui_input_list(caller,"Pick the bodypart to change:", "Refactor - One Bodypart", species.has_limbs)
if(!choice)
return
@@ -326,7 +326,7 @@
if(nano_dead_check(src))
to_chat(caller, "<span class='warning'>You need to be repaired first before you can act!</span>")
return
to_chat(src, "<span class='notice'>You rapidly condense into your module.</span>")
to_chat(caller, "<span class='notice'>You rapidly condense into your module.</span>")
if(forced || do_after(caller,20,exclusive = TASK_ALL_EXCLUSIVE))
if(!temporary_form) //If you're human, force you into blob form before rig'ing
nano_blobform(forced)
@@ -369,7 +369,7 @@
to_chat(temporary_form, "<span class='warning'>Somehow, your RIG got disconnected from your species. This may have been caused by an admin heal. A new one has been created for you, contact a coder.</span>")
new /obj/item/weapon/rig/protean(src,src)
else
to_chat(src, "<span class='warning'>You must remain still to condense!</span>")
to_chat(caller, "<span class='warning'>You must remain still to condense!</span>")
/mob/living/carbon/human/proc/appearance_switch()
set name = "Switch Blob Appearance"

69
modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm
View File

@@ -136,6 +136,7 @@
SPECIES_VOX = 'modular_chomp/icons/mob/head_ch.dmi'
)
icon = 'modular_chomp/icons/mob/head_ch.dmi'
default_worn_icon = 'modular_chomp/icons/mob/head_ch.dmi'
/obj/item/clothing/gloves/gauntlets/rig/protean
name = "mass"
@@ -179,48 +180,19 @@
SPECIES_VOX = 'modular_chomp/icons/mob/hands_ch.dmi'
)
icon = 'modular_chomp/icons/mob/hands_ch.dmi'
default_worn_icon = 'modular_chomp/icons/mob/hands_ch.dmi'
/obj/item/clothing/shoes/magboots/rig/protean
name = "mass"
desc = "Boot-shaped clusters of nanomachines."
species_restricted = list(SPECIES_PROTEAN, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN)
sprite_sheets = list(
SPECIES_PROTEAN = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_HUMAN = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_TAJ = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_SKRELL = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_UNATHI = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_XENOHYBRID = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_AKULA = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_SERGAL = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_NEVREAN = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_VULPKANIN = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_ZORREN_HIGH = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_FENNEC = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_PROMETHEAN = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_TESHARI = 'modular_chomp/icons/mob/species/teshari/feet_ch.dmi',
SPECIES_VASILISSAN = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_VOX = 'modular_chomp/icons/mob/species/vox/shoes_ch.dmi'
)
sprite_sheets_obj = list(
SPECIES_HUMAN = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_TAJ = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_SKRELL = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_UNATHI = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_XENOHYBRID = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_AKULA = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_SERGAL = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_NEVREAN = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_VULPKANIN = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_ZORREN_HIGH = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_FENNEC = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_PROMETHEAN = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_TESHARI = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_VASILISSAN = 'modular_chomp/icons/mob/feet_ch.dmi',
SPECIES_VOX = 'modular_chomp/icons/mob/feet_ch.dmi'
)
sprite_sheets_obj = list()
icon = 'modular_chomp/icons/mob/feet_ch.dmi'
default_worn_icon = 'modular_chomp/icons/mob/feet_ch.dmi'
/obj/item/clothing/suit/space/rig/protean
name = "mass"
@@ -236,42 +208,13 @@
/obj/item/weapon/storage/backpack,
)
sprite_sheets = list(
SPECIES_PROTEAN = 'modular_chomp/icons/mob/spacesuit_ch.dmi',
SPECIES_HUMAN = 'modular_chomp/icons/mob/spacesuit_ch.dmi',
SPECIES_TAJ = 'modular_chomp/icons/mob/species/tajaran/suit_ch.dmi',
SPECIES_SKRELL = 'modular_chomp/icons/mob/species/skrell/suit_ch.dmi',
SPECIES_UNATHI = 'modular_chomp/icons/mob/species/unathi/suit_ch.dmi',
SPECIES_XENOHYBRID = 'modular_chomp/icons/mob/species/unathi/suit_ch.dmi',
SPECIES_AKULA = 'modular_chomp/icons/mob/species/akula/suit_ch.dmi',
SPECIES_SERGAL = 'modular_chomp/icons/mob/species/sergal/suit_ch.dmi',
SPECIES_NEVREAN = 'modular_chomp/icons/mob/species/sergal/suit_ch.dmi',
SPECIES_VULPKANIN = 'modular_chomp/icons/mob/species/vulpkanin/suit_ch.dmi',
SPECIES_ZORREN_HIGH = 'modular_chomp/icons/mob/species/fox/suit_ch.dmi',
SPECIES_FENNEC = 'modular_chomp/icons/mob/species/vulpkanin/suit_ch.dmi',
SPECIES_PROMETHEAN = 'modular_chomp/icons/mob/species/skrell/suit_ch.dmi',
SPECIES_TESHARI = 'modular_chomp/icons/mob/species/teshari/suit_ch.dmi',
SPECIES_VASILISSAN = 'modular_chomp/icons/mob/species/skrell/suit_ch.dmi',
SPECIES_VOX = 'modular_chomp/icons/mob/species/vox/suit_ch.dmi'
)
sprite_sheets_obj = list(
SPECIES_HUMAN = 'modular_chomp/icons/mob/spacesuit_ch.dmi',
SPECIES_TAJ = 'modular_chomp/icons/mob/spacesuit_ch.dmi',
SPECIES_SKRELL = 'modular_chomp/icons/mob/spacesuit_ch.dmi',
SPECIES_UNATHI = 'modular_chomp/icons/mob/spacesuit_ch.dmi',
SPECIES_XENOHYBRID = 'modular_chomp/icons/mob/spacesuit_ch.dmi',
SPECIES_AKULA = 'modular_chomp/icons/mob/spacesuit_ch.dmi',
SPECIES_SERGAL = 'modular_chomp/icons/mob/spacesuit_ch.dmi',
SPECIES_NEVREAN = 'modular_chomp/icons/mob/spacesuit_ch.dmi',
SPECIES_VULPKANIN = 'modular_chomp/icons/mob/spacesuit_ch.dmi',
SPECIES_ZORREN_HIGH = 'modular_chomp/icons/mob/spacesuit_ch.dmi',
SPECIES_FENNEC = 'modular_chomp/icons/mob/spacesuit_ch.dmi',
SPECIES_PROMETHEAN = 'modular_chomp/icons/mob/spacesuit_ch.dmi',
SPECIES_TESHARI = 'modular_chomp/icons/mob/spacesuit_ch.dmi',
SPECIES_VASILISSAN = 'modular_chomp/icons/mob/spacesuit_ch.dmi',
SPECIES_VOX = 'modular_chomp/icons/mob/spacesuit_ch.dmi'
)
sprite_sheets_obj = list()
icon = 'modular_chomp/icons/mob/spacesuit_ch.dmi'
default_worn_icon = 'modular_chomp/icons/mob/spacesuit_ch.dmi'
//Copy pasted most of this proc from base because I don't feel like rewriting the base proc with a shit load of exceptions
/obj/item/weapon/rig/protean/attackby(obj/item/W as obj, mob/living/user as mob)