cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

weh

Browse Source
This commit is contained in:
Azarak
2020-10-10 03:42:07 +02:00
parent 970a2b03d6
commit a7cb5eb7ee
10 changed files with 71 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/game_options.txt
+2
View File
@@ -471,6 +471,8 @@ ROUNDSTART_RACES dwarf
ROUNDSTART_RACES ipc
ROUNDSTART_RACES synthliz
ROUNDSTART_RACES vox
ROUNDSTART_RACES aquatic
ROUNDSTART_RACES insect
##-------------------------------------------------------------------------------------------
modular_skyrat/modules/customization/icons/mob/species/insect_parts_greyscale.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

modular_skyrat/modules/customization/modules/mob/dead/new_player/body_markings/body_marking_sets.dm
+1 -1
View File
@@ -4,7 +4,7 @@
///List of the body markings in this set
var/body_marking_list
///Which species is this marking recommended to. Important for randomisations.
var/recommended_species = list("mammal", "tajaran", "vulpkanin", "akula")
var/recommended_species = list("mammal", "tajaran", "vulpkanin", "aquatic", "akula")
/datum/body_marking_set/none
name = "None"
modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm
+1 -1
View File
@@ -32,7 +32,7 @@
recommended_species = list("mammal", "human", "felinid", "tajaran", "humanoid")
/datum/sprite_accessory/ears/mutant/akula
recommended_species = list("mammal", "human", "felinid", "akula", "humanoid")
recommended_species = list("mammal", "human", "felinid", "aquatic", "akula", "humanoid")
/datum/sprite_accessory/ears/mutant/axolotl
name = "Axolotl"
modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm
+1 -1
View File
@@ -29,7 +29,7 @@
recommended_species = list("mammal", "tajaran", "humanoid")
/datum/sprite_accessory/snouts/mammal/akula
recommended_species = list("mammal", "akula", "humanoid")
recommended_species = list("mammal", "akula", "aquatic", "humanoid")
/datum/sprite_accessory/snouts/mammal/bird
name = "Beak"
modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/tails.dm
+1 -1
View File
@@ -49,7 +49,7 @@
recommended_species = list("mammal", "human", "tajaran", "humanoid")
/datum/sprite_accessory/tails/mammal/wagging/akula
recommended_species = list("mammal", "human", "akula", "humanoid")
recommended_species = list("mammal", "human", "akula", "aquatic", "humanoid")
/datum/sprite_accessory/tails/mammal/wagging/axolotl
name = "Axolotl"
modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/wings.dm
+1 -1
View File
@@ -27,7 +27,7 @@
/datum/sprite_accessory/wings/moth
icon = 'modular_skyrat/modules/customization/icons/mob/sprite_accessory/moth_wings.dmi' //Needs new icon to suit new naming convention
default_color = "FFF"
recommended_species = list("moth", "mammal") //Mammals too, I guess. They wont get flight though, see the wing organs for that logic
recommended_species = list("moth", "mammal", "insect") //Mammals too, I guess. They wont get flight though, see the wing organs for that logic
organ_type = /obj/item/organ/wings/moth
/datum/sprite_accessory/wings/moth/plain
modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm
+51
View File
@@ -0,0 +1,51 @@
/datum/species/aquatic
name = "Aquatic"
id = "aquatic"
default_color = "4B4B4B"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAS_FLESH,HAS_BONE,HAIR, FACEHAIR)
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID
default_features = null
mutant_bodyparts = list()
default_mutant_bodyparts = list("tail" = ACC_RANDOM, "snout" = ACC_RANDOM, "horns" = "None", "ears" = ACC_RANDOM, "legs" = "Normal Legs", "wings" = "None")
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
liked_food = GROSS | MEAT | FRIED
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
limbs_icon = 'modular_skyrat/modules/customization/icons/mob/species/akula_parts_greyscale.dmi'
limbs_id = "akula"
/datum/species/aquatic/get_random_features()
var/list/returned = MANDATORY_FEATURE_LIST
var/main_color
var/second_color
var/random = rand(1,5)
//Choose from a variety of sharkish colors, with a whiter secondary and tertiary
switch(random)
if(1)
main_color = "689"
second_color = "BCD"
if(2)
main_color = "345"
second_color = "DDE"
if(3)
main_color = "456"
second_color = "DDE"
if(4)
main_color = "665"
second_color = "DDE"
if(5)
main_color = "444"
second_color = "DDE"
returned["mcolor"] = main_color
returned["mcolor2"] = second_color
returned["mcolor3"] = second_color
return returned
/datum/species/aquatic/get_random_body_markings(list/passed_features)
var/name = "Shark"
var/datum/body_marking_set/BMS = GLOB.body_marking_sets[name]
var/list/markings = list()
if(BMS)
markings = assemble_body_markings_from_set(BMS, passed_features, src)
return markings
modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/insect.dm
+11
View File
@@ -0,0 +1,11 @@
/datum/species/insect
name = "Anthromorphic Insect"
id = "insect"
default_color = "4B4B4B"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAS_FLESH,HAS_BONE,HAIR,FACEHAIR)
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG
default_features = null
mutant_bodyparts = list()
default_mutant_bodyparts = list("tail" = "None", "snout" = "None", "horns" = "None", "ears" = "None", "legs" = "Normal Legs", "taur" = "None", "wings" = "Bee", "moth_antennae" = ACC_RANDOM)
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
limbs_icon = 'modular_skyrat/modules/customization/icons/mob/species/insect_parts_greyscale.dmi'
tgstation.dme
+2
View File
@@ -3390,8 +3390,10 @@
#include "modular_skyrat\modules\customization\modules\mob\living\carbon\human\species.dm"
#include "modular_skyrat\modules\customization\modules\mob\living\carbon\human\status_procs.dm"
#include "modular_skyrat\modules\customization\modules\mob\living\carbon\human\species\akula.dm"
#include "modular_skyrat\modules\customization\modules\mob\living\carbon\human\species\aquatic.dm"
#include "modular_skyrat\modules\customization\modules\mob\living\carbon\human\species\dwarf.dm"
#include "modular_skyrat\modules\customization\modules\mob\living\carbon\human\species\humanoid.dm"
#include "modular_skyrat\modules\customization\modules\mob\living\carbon\human\species\insect.dm"
#include "modular_skyrat\modules\customization\modules\mob\living\carbon\human\species\lizard.dm"
#include "modular_skyrat\modules\customization\modules\mob\living\carbon\human\species\mammal.dm"
#include "modular_skyrat\modules\customization\modules\mob\living\carbon\human\species\moth.dm"