cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-04 14:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds Taoism to the game. Removes Odin grey hoodies. (#9953)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2020-09-13 21:18:48 +08:00
committed by GitHub
parent c0b25c8039
commit c9451d2ded
10 changed files with 55 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/jobs/job/job.dm
View File

@@ -156,13 +156,9 @@
var/wealth = (loyalty + economic_modifier + species_modifier)
switch(wealth)
if(-INFINITY to 2)
if(-INFINITY to 6)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
if(3 to 6)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/grey(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
if(7 to 9)
H.equip_to_slot_or_del(new /obj/item/clothing/under/sl_suit(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)

5
code/game/objects/items/weapons/storage/bible.dm
View File

@@ -89,9 +89,6 @@
if("Scroll")
icon_state = "scroll"
item_state = "scroll"
if("The King in Yellow")
icon_state = "kingyellow"
item_state = "kingyellow"
if("Ithaqua")
icon_state = "ithaqua"
item_state = "ithaqua"
@@ -111,7 +108,7 @@
icon_state = "necronomicon"
item_state = "necronomicon"
else
var/randbook = "book" + pick("1", "2", "3", "4", "5", "6" , "7")
var/randbook = "book" + pick("1", "2", "3", "4", "5", "6" , "7", "8", "9", "10", "11", "12", "13" , "14", "15" , "16")
icon_state = randbook
item_state = randbook

3
code/modules/background/defines.dm
View File

@@ -30,6 +30,7 @@
#define RELIGION_MOROZ "Moroz Holy Tribunal"
#define RELIGION_TRINARY "Trinary Perfection"
#define RELIGION_SCARAB "Scarab Folk Beliefs"
#define RELIGION_TAOISM "Taoism"
#define RELIGION_THAKH "Th'akh"
#define RELIGION_SKAKH "Sk'akh"
@@ -97,4 +98,4 @@
#define ACCENT_ZORA "Zo'rane"
#define ACCENT_KLAX "K'laxane"
#define ACCENT_CTHUR "C'thuric"
#define ACCENT_CTHUR "C'thuric"

10
code/modules/background/religion/human.dm
View File

@@ -26,12 +26,12 @@
/datum/religion/hindu
name = RELIGION_HINDU
description = "An Indian religion encompassing a variety of traditions, beliefs and spiritual practices. Someone who practices Hinduism is called a Hindu."
description = "An Indian polytheistic religion encompassing a variety of traditions, beliefs and spiritual practices. Someone who practices Hinduism is called a Hindu."
book_name = "vedas"
/datum/religion/buddhism
name = RELIGION_BUDDHISM
description = "An Indian religion encompassing a variety of traditions, beliefs and spiritual practices based on the teachings of the Buddha. Someone who practices Buddhism is called a Buddhist."
description = "An Indian nontheistic religion encompassing a variety of traditions, beliefs and spiritual practices based on the teachings of the Buddha. Someone who practices Buddhism is called a Buddhist."
book_name = "tripitaka"
/datum/religion/moroz
@@ -58,3 +58,9 @@
and one must always be aware of the Shaitan - a malevolent spirit in Scarab folklore that personifies all evil."
book_name = "Collected Scarab Tales"
book_sprite = "scrapbook"
/datum/religion/taoism
name = RELIGION_TAOISM
description = "A Chinese nontheistic religion and philosophical tradition which emphasises living in harmony with the Tao. Someone who practices Taoism is called a Taoist."
book_name = "tao te ching"
book_sprite = "scroll"

4
code/modules/clothing/suits/hoodies.dm
View File

@@ -213,10 +213,6 @@
name = "hood"
desc = "A hood attached to a warm hoodie."
/obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/grey //legacy item. for raiders, shuttle spawn
color = "#777777"
/obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/random/Initialize()
. = ..()
color = get_random_colour(lower = 150)

2
code/modules/mob/living/carbon/human/species/species.dm
View File

@@ -233,7 +233,7 @@
var/default_f_style = "Shaved"
var/list/allowed_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_ELYRA, CITIZENSHIP_ERIDANI, CITIZENSHIP_DOMINIA)
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)
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)