Adds an accent and several loadout items. (#9966)

This commit is contained in:
TheStryker
2020-09-14 21:26:50 -03:00
committed by GitHub
parent 475a89bbd1
commit cdf5e7651f
20 changed files with 117 additions and 4 deletions
+8 -1
View File
@@ -143,4 +143,11 @@
description = "The so-called \"Deep Frontier\" accent is not truly a unified accent at all, and instead defines a broad range of accents from the more \"wild\" frontier outside of human control. \
Those with these accents are almost universally looked down upon as wild savages by their counterparts in more civilized space at best. Speakers of this accent are almost always found in lower-end \
positions in civilized space, due to the typically impoverished and anarchic nature of the Deep Frontier."
tag_icon = "deepfrontier"
tag_icon = "deepfrontier"
/datum/accent/fisanduh
name = ACCENT_FISANDUH
description = "While it is similar to the typical Morozian accent, to those not familiar with it; or not from the Empire of Dominia, the standard Fisanduhian accent has some variations that mark it as distinctive. \
The accent is higher pitched than its Dominian counterpart, and has been described as more tonal. Members of the Fisanduh Freedom Front will often go to great lengths to disguise this accent, \
though most will slip back into it when off-world."
tag_icon = "fisanduh"
+1
View File
@@ -72,6 +72,7 @@
#define ACCENT_EUROPA "Europan"
#define ACCENT_EARTH "Earther"
#define ACCENT_DEEPFRONTIER "Deep Frontier"
#define ACCENT_FISANDUH "Fisanduhian"
#define ACCENT_REPUBICLANSIIK "Republican Siik'maas"
#define ACCENT_NAZIRASIIK "Nazira Siik'maas"
@@ -48,6 +48,11 @@
armbands["IAC armband"] = /obj/item/clothing/accessory/armband/iac
gear_tweaks += new/datum/gear_tweak/path(armbands)
/datum/gear/accessory/armband_coloured
display_name = "armband (colourable)"
path = /obj/item/clothing/accessory/armband/colourable
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/holster
display_name = "holster selection"
path = /obj/item/clothing/accessory/holster/armpit
@@ -18,6 +18,11 @@
slot = slot_wear_suit
faction = "Idris Incorporated"
/datum/gear/faction/idris_armband
display_name = "idris armband"
path = /obj/item/clothing/head/beret/sec/idris
faction = "Idris Incorporated"
/datum/gear/faction/zavodskoi_beret
display_name = "brown zavodskoi beret"
path = /obj/item/clothing/head/beret/sec/zavodskoi
@@ -270,3 +270,8 @@
display_name = "vysokan fur cap"
path = /obj/item/clothing/head/soft/vysoka
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/head/buckethat
display_name = "bucket hat"
path = /obj/item/clothing/head/buckethat
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
@@ -305,10 +305,17 @@
gear_tweaks += new/datum/gear_tweak/path(cardigan)
/datum/gear/suit/himeo
display_name = "himean coat"
display_name = "himean coat selection"
path = /obj/item/clothing/suit/storage/toggle/himeo
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/suit/himeo/New()
..()
var/coat = list()
coat["brown himean bekesha"] = /obj/item/clothing/suit/storage/toggle/himeo
coat["grey himean bekesha"] = /obj/item/clothing/suit/storage/toggle/himeo/grey
gear_tweaks += new/datum/gear_tweak/path(coat)
/datum/gear/suit/vysoka
display_name = "chokha selection"
description = "A selection of Vysokan chokhas."
@@ -59,6 +59,8 @@
skirts["high skirt"] = /obj/item/clothing/under/skirt/high
skirts["skater skirt"] = /obj/item/clothing/under/skirt/skater
skirts["tube skirt"] = /obj/item/clothing/under/skirt/tube
skirts["jumper skirt"] = /obj/item/clothing/under/skirt/jumper
skirts["jumper dress"] = /obj/item/clothing/under/skirt/jumper_highcut
gear_tweaks += new/datum/gear_tweak/path(skirts)
/datum/gear/uniform/suit
+5
View File
@@ -7,6 +7,11 @@
item_state = "coat_himeo"
contained_sprite = TRUE
/obj/item/clothing/suit/storage/toggle/himeo/grey
icon = 'icons/clothing/suits/coats/himeo_coat_grey.dmi'
icon_state = "coat_himeo_grey"
item_state = "coat_himeo_grey"
/obj/item/clothing/head/soft/himeo
name = "himean cap"
+5
View File
@@ -698,3 +698,8 @@
desc = "A padded skullcap for those prone to bumping their heads against hard surfaces."
icon_state = "tank"
flags_inv = BLOCKHEADHAIR
/obj/item/clothing/head/buckethat
name = "bucket hat"
desc = "A hat with an all-around visor. Only slightly better than wearing an actual bucket."
icon_state = "buckethat"
@@ -60,4 +60,15 @@
/obj/item/clothing/accessory/armband/offworlder/medical
name = "medical exo-stellar ribbon"
desc = "Durable cloth meant to be worn over or attached to the chest pieces of the ESS modules. This one is white and green."
icon_state = "ribbon_med"
icon_state = "ribbon_med"
/obj/item/clothing/accessory/armband/idris
name = "\improper Idris Incorporated armband"
desc = "A armband, worn by contractors to denote which company they're from. This one shows the Idris Incorporated logo displayed on a cyan background."
icon_state = "idris_armband"
overlay_state = "idris_armband"
/obj/item/clothing/accessory/armband/colourable
name = "armband"
desc = "An armband in 16,777,216 designer colors."
icon_state = "armband_colour"
+16
View File
@@ -91,3 +91,19 @@
item_state = "crskirt"
worn_state = "crskirt"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/skirt/jumper
name = "jumper skirt"
desc = "A short skirt with two large shoulder straps."
desc_fluff = "Too tall or too short? Too bad. These shoulder straps can't be adjusted."
icon_state = "skirt_jumper"
worn_state = "skirt_jumper"
item_state = "skirt_jumper"
/obj/item/clothing/under/skirt/jumper_highcut
name = "jumper dress"
desc = "A garment with open sides that seems to be a cross between a dress and an apron."
desc_fluff = "You could achieve the same effect with two aprons, we're pretty sure."
icon_state = "skirt_jumper_highcut"
worn_state = "skirt_jumper_highcut"
item_state = "skirt_jumper_highcut"
@@ -236,7 +236,7 @@
var/list/allowed_religions = list(RELIGION_NONE, RELIGION_OTHER, RELIGION_CHRISTIANITY, RELIGION_ISLAM, RELIGION_JUDAISM, RELIGION_HINDU, RELIGION_BUDDHISM, RELIGION_MOROZ, RELIGION_TRINARY, RELIGION_SCARAB, RELIGION_TAOISM)
var/default_citizenship = CITIZENSHIP_BIESEL
var/list/allowed_accents = list(ACCENT_CETI, ACCENT_GIBSON, ACCENT_SOL, ACCENT_MARTIAN, ACCENT_LUNA, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_JUPITER, ACCENT_COC, ACCENT_ELYRA, ACCENT_ERIDANI,
ACCENT_ERIDANIDREG, ACCENT_VYSOKA, ACCENT_HIMEO, ACCENT_PHONG, ACCENT_SILVERSUN, ACCENT_DOMINIA, ACCENT_KONYAN, ACCENT_EUROPA, ACCENT_EARTH, ACCENT_DEEPFRONTIER)
ACCENT_ERIDANIDREG, ACCENT_VYSOKA, ACCENT_HIMEO, ACCENT_PHONG, ACCENT_SILVERSUN, ACCENT_DOMINIA, ACCENT_KONYAN, ACCENT_EUROPA, ACCENT_EARTH, ACCENT_DEEPFRONTIER, ACCENT_FISANDUH)
var/default_accent = ACCENT_CETI
var/zombie_type //What zombie species they become
var/list/character_color_presets