diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm index f0575e50f0..29ffcf5391 100644 --- a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm @@ -1 +1,11 @@ //GS13 - markings, ported or our own (preferably mark where you took them from) + +/datum/sprite_accessory/hair/elize + name = "Elize" + icon = 'GainStation13/icons/mob/human_face.dmi' + icon_state = "hair_elize" + +/datum/sprite_accessory/hair/lem + name = "Lem" + icon = 'GainStation13/icons/mob/human_face.dmi' + icon_state = "hair_lem" diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm index e2ab27aad4..32d38c386a 100644 --- a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm @@ -7,6 +7,7 @@ icon_state = "gator" color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN + hide_legs = FALSE /datum/sprite_accessory/taur/fatdrake //ported from Vorestation name = "Fat Drake" @@ -46,3 +47,17 @@ icon = 'GainStation13/icons/mob/markings/mam_taur.dmi' icon_state = "bigleggy" color_src = MUTCOLORS + +/datum/sprite_accessory/taur/fatnaga //ported from Vorestation + name = "Fat Naga" + icon = 'GainStation13/icons/mob/markings/mam_taur.dmi' + icon_state = "fatnaga" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/taur/altnaga //ported from Vorestation + name = "Alt Naga" + icon = 'GainStation13/icons/mob/markings/mam_taur.dmi' + icon_state = "altnaga" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm index 40fb7df37f..96786439c4 100644 --- a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm @@ -6,3 +6,50 @@ icon_state = "hjackal" color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/snouts/mam_snouts/synthlizproto1 + name = "Synthetic Lizard - Prototype Visor 1" + icon = 'GainStation13/icons/mob/markings/mam_snouts.dmi' + icon_state = "synthlizproto1" + color_src = MATRIXED + +/datum/sprite_accessory/snouts/mam_snouts/synthlizproto2 + name = "Synthetic Lizard - Prototype Visor 2" + icon = 'GainStation13/icons/mob/markings/mam_snouts.dmi' + icon_state = "synthlizproto2" + color_src = MATRIXED + +/datum/sprite_accessory/snouts/mam_snouts/gator + name = "Gator" + icon = 'GainStation13/icons/mob/markings/mam_snouts.dmi' + icon_state = "gator" + color_src = MATRIXED + +//eastern dragon +/datum/sprite_accessory/snouts/mam_snouts/easterndragon + name = "Eastern Dragon" + icon = 'GainStation13/icons/mob/markings/char_snouts.dmi' + icon_state = "easterndw" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/snouts/mam_snouts/easterndragon/no_whiskers + name = "Eastern Dragon - No Whiskers" + icon = 'GainStation13/icons/mob/markings/char_snouts.dmi' + icon_state = "easterndnw" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/snouts/mam_snouts/feasterndragon + name = "Eastern Dragon (Top)" + icon = 'GainStation13/icons/mob/markings/char_snouts.dmi' + icon_state = "feasterndw" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/snouts/mam_snouts/feasterndragon/no_whiskers + name = "Eastern Dragon - No Whiskers (Top)" + icon = 'GainStation13/icons/mob/markings/char_snouts.dmi' + icon_state = "feasterndnw" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/tails.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/tails.dm index f0575e50f0..50c743abf6 100644 --- a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/tails.dm +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/tails.dm @@ -1 +1,92 @@ //GS13 - markings, ported or our own (preferably mark where you took them from) + +//snaketail +/datum/sprite_accessory/tails/lizard/snaketail //GS13 - ...6 seperate paths for one tail. Wew. + name = "Snaketail" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "snaketail" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/tails_animated/lizard/snaketail + name = "Snaketail" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "snaketail" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/tails/human/snaketail + name = "Snaketail" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "snaketail" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/tails_animated/human/snaketail + name = "Snaketail" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "snaketail" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/tails/mam_tails/snaketail + name = "Snaketail" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "snaketail" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/tails_animated/mam_tails_animated/snaketail + name = "Snaketail" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "snaketail" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +//spaded tail +/datum/sprite_accessory/tails/mam_tails/spade + name = "Demon Spade" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "spade" + +/datum/sprite_accessory/tails_animated/mam_tails_animated/spade + name = "Demon Spade" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "spade" + +/datum/sprite_accessory/tails/human/spade + name = "Demon Spade" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "spade" + +/datum/sprite_accessory/tails_animated/human/spade + name = "Demon Spade" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "spade" + +//deer tail + + +/datum/sprite_accessory/tails/human/deer + name = "Deer" + icon_state = "deer" + color_src = MATRIXED + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + +/datum/sprite_accessory/tails_animated/human/deer + name = "Deer" + icon_state = "deer" + color_src = MATRIXED + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + +/datum/sprite_accessory/tails/mam_tails/deer + name = "Deer" + icon_state = "deer" + color_src = MATRIXED + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + +/datum/sprite_accessory/tails_animated/mam_tails_animated/deer + name = "Deer" + icon_state = "deer" + color_src = MATRIXED + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' diff --git a/GainStation13/icons/mob/human_face.dmi b/GainStation13/icons/mob/human_face.dmi new file mode 100644 index 0000000000..3e73aaca82 Binary files /dev/null and b/GainStation13/icons/mob/human_face.dmi differ diff --git a/GainStation13/icons/mob/markings/char_snouts.dmi b/GainStation13/icons/mob/markings/char_snouts.dmi new file mode 100644 index 0000000000..92b3163d84 Binary files /dev/null and b/GainStation13/icons/mob/markings/char_snouts.dmi differ diff --git a/GainStation13/icons/mob/markings/mam_taur.dmi b/GainStation13/icons/mob/markings/mam_taur.dmi index 3b6ed4bcfa..736e047fb8 100644 Binary files a/GainStation13/icons/mob/markings/mam_taur.dmi and b/GainStation13/icons/mob/markings/mam_taur.dmi differ diff --git a/GainStation13/icons/obj/device.dmi b/GainStation13/icons/obj/device.dmi new file mode 100644 index 0000000000..b4a7291677 Binary files /dev/null and b/GainStation13/icons/obj/device.dmi differ diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index bd97c822e4..291b9e21d4 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -73,7 +73,7 @@ GENETICS SCANNER /obj/item/healthanalyzer name = "health analyzer" - icon = 'icons/obj/device.dmi' + icon = 'GainStation13/icons/obj/device.dmi' //GS13 - better sprite icon_state = "health" item_state = "healthanalyzer" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' @@ -545,6 +545,7 @@ GENETICS SCANNER /obj/item/healthanalyzer/advanced name = "advanced health analyzer" + icon = 'GainStation13/icons/obj/device.dmi' //GS13 - better sprite icon_state = "health_adv" desc = "A hand-held body scanner able to distinguish vital signs of the subject with high accuracy." advanced = TRUE diff --git a/code/modules/events/untie_shoes.dm b/code/modules/events/untie_shoes.dm index 98245280a6..45e9cf4ede 100644 --- a/code/modules/events/untie_shoes.dm +++ b/code/modules/events/untie_shoes.dm @@ -2,7 +2,7 @@ name = "Untied Shoes" typepath = /datum/round_event/untied_shoes weight = 50 - max_occurrences = 0 - //GS13 - tedious and lame + max_occurrences = 0 //GS13 - tedious and lame alert_observers = FALSE category = EVENT_CATEGORY_HEALTH description = "Unties people's shoes, with a chance to knot them as well."