Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STARFLY 13 Identity Creation #14

Merged
merged 7 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,729 changes: 4,729 additions & 0 deletions _maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm

Large diffs are not rendered by default.

3,321 changes: 3,321 additions & 0 deletions _maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions _maps/map_catalogue.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
Size = (x = 85)(y = 47)(z = 1)
Tags = "Minor Combat Challenge", "Shelter", "Medium loot", "Ghost Role"

File Name = _maps\RandomRuins\IceRuins\icemoon_crashed_holemaker.dmm
Size = (x = 47)(y = 37)(z = 1)
Tags = "Medium Combat Challenge", "Minor Loot", "Shelter"



JungleRuins:
Expand Down Expand Up @@ -332,6 +336,11 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
Size = (x = 7)(y = 9)(z = 1)
Tags = "No Combat", "Minor Loot", "Inhospitable"

File Name = "_maps\RandomRuins\Ruins\whitesands_surface_pubbyslopcrash.dmm"
Size = (x = 35)(y = 25)(z = 1)
Tags = "Minor Combat Challange", "Medium Loot", "Shelter"



SpaceRuins:
File Name = "_maps\RandomRuins\SpaceRuins\.dmm"
Expand Down
6 changes: 6 additions & 0 deletions code/datums/ruins/icemoon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,9 @@
id = "slimelab"
description = "An underground research facility devoted to researching the uncommon slime lifeform"
suffix = "icemoon_underground_slimelab.dmm"

/datum/map_template/ruin/icemoon/crashed_holemaker
name = "Crashed Holemaker"
id = "crashed_holemaker"
description = "Safety records for early Nanotrasen Spaceworks vessels were, and always have been, top of their class. Absolutely no multi-billion credit projects have been painstakingly erased from history. (Citation Needed)"
suffix = "icemoon_crashed_holemaker.dmm"
7 changes: 7 additions & 0 deletions code/datums/ruins/whitesands.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
description = "Some sort of survivors, brandishing old nanotrasen security gear."
suffix = "whitesands_surface_chokepoint.dmm"

/datum/map_template/ruin/whitesands/pubbyslopcrash
name = "Pubby Slop Crash"
id = "ws-pubbyslopcrash"
description = "A failed attempt of the Nanotrasen nutrional replacement program"
suffix = "whitesands_surface_pubbyslopcrash.dmm"

//////////OUTSIDE SETTLEMENTS/RUINS//////////
/datum/map_template/ruin/whitesands/survivors/drugstore
name = "Abandoned Store"
Expand All @@ -67,3 +73,4 @@
description = "A small encampment of nomadic survivors of the First Colony, and their descendants. By all accounts, feral and without allegance to anyone but themselves."
suffix = "whitesands_surface_camp_combination.dmm"
allow_duplicates = FALSE

5 changes: 5 additions & 0 deletions code/game/area/areas/ruins/icemoon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,8 @@
/area/ruin/powered/slimelab/cafe
name = "Slime Lab Cafe"
icon_state = "green"

// Crashed Holemaker
/area/ruin/unpowered/crashed_holemaker
name = "NTSV Holemaker II" // In honor of the kugelblitz shenanigan of all time
icon_state = "green"
4 changes: 4 additions & 0 deletions code/game/area/areas/ruins/sandplanet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@
/area/ruin/whitesands/saloon
name = "Hermit Saloon"
icon_state = "green"

/area/ruin/whitesands/pubbycrash
name = "Pubby Crash"
icon_state = "blue"
5 changes: 5 additions & 0 deletions code/game/turfs/open/floor/plating/planet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@
if(prob(floor_variance))
icon_state = "[initial(icon_state)][rand(0,12)]"

/turf/open/floor/plating/dirt/icemoon
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
baseturfs = /turf/open/floor/plating/dirt/icemoon
planetary_atmos = TRUE

/turf/open/floor/plating/grass/jungle
name = "jungle grass"
planetary_atmos = TRUE
Expand Down
12 changes: 12 additions & 0 deletions code/modules/awaymissions/corpse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,9 @@
outfit = /datum/outfit/job/assistant
icon_state = "corpsegreytider"

/obj/effect/mob_spawn/human/corpse/assistant/husked
husk = TRUE

/obj/effect/mob_spawn/human/corpse/assistant/beesease_infection
disease = /datum/disease/beesease

Expand All @@ -326,6 +329,8 @@
outfit = /datum/outfit/job/cook
icon_state = "corpsecook"

/obj/effect/mob_spawn/human/cook/husked
husk = TRUE

/obj/effect/mob_spawn/human/doctor
name = "Doctor"
Expand Down Expand Up @@ -391,6 +396,9 @@
outfit = /datum/outfit/job/botanist
icon_state = "corpsehuman"

/obj/effect/mob_spawn/human/botanist/husked
husk = TRUE

/obj/effect/mob_spawn/human/sec
outfit = /datum/outfit/job/security
icon_state = "corpsehuman"
Expand All @@ -405,10 +413,14 @@

/obj/effect/mob_spawn/human/bartender
name = "Space Bartender"
icon_state = "corpsebartender"
id_job = "Bartender"
id_access_list = list(ACCESS_BAR)
outfit = /datum/outfit/spacebartender

/obj/effect/mob_spawn/human/bartender/husked
husk = TRUE

/obj/effect/mob_spawn/human/bartender/alive
death = FALSE
roundstart = FALSE
Expand Down
6 changes: 3 additions & 3 deletions code/modules/clothing/under/syndicate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

/obj/item/clothing/under/syndicate/sniper
name = "Tactical turtleneck suit"
desc = "A double seamed tactical turtleneck disguised as a civilian grade silk suit. Intended for the most formal operator. The collar is really sharp."
desc = "A double seamed tactical turtleneck disguised as a civilian grade silk suit. Popular among high-ranking Roseus Galactic staff."
icon = 'icons/obj/clothing/under/suits.dmi'
icon_state = "really_black_suit"
item_state = "bl_suit"
Expand Down Expand Up @@ -102,8 +102,8 @@
alt_covers_chest = TRUE

/obj/item/clothing/under/syndicate/aclfgrunt
name = "ACLF uniform"
desc = "A button-up in a tasteful shade of gray with red pants, used as the uniform of the Anti-Corporate Liberation front on the rim."
name = "Roseus Galactic uniform"
desc = "A button-up in a tasteful shade of gray with red pants, used as the uniform of the Roseus Galactic corporation on the rim."
icon_state = "aclfgrunt"
can_adjust = FALSE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/food_and_drinks/drinks/drinks/bottle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,8 @@
return

/obj/item/reagent_containers/food/drinks/bottle/lizardwine
name = "bottle of 'kalixcis' wine"
desc = "An alcoholic beverage of sarathi origin, now so widespread that knock-offs can be found everywhere. Check the label for point of origin."
name = "bottle of Moghesan wine"
desc = "An alcoholic beverage made from the fruits of assorted Moghesan cacti."
icon_state = "lizardwine"
list_reagents = list(/datum/reagent/consumable/ethanol/lizardwine = 100)
foodtype = FRUIT | ALCOHOL
Expand Down
23 changes: 23 additions & 0 deletions code/modules/language/draconic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,26 @@
icon_state = "lizard"
default_priority = 90

/datum/language/kalixcis
name = "Kalixcian"
desc = "The native language of the Elzuosa, consisting of rattles and clicks with a surprisingly complex structure."
speech_verb = "clicks"
ask_verb = "clicks"
exclaim_verb = "clacks"
sing_verb = "rattles"
key = "K"
flags = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding
space_chance = 40
syllables = list(
"za", "az", "ze", "ez", "zi", "iz", "zo", "oz", "zu", "uz", "zs", "sz",
"ha", "ah", "he", "eh", "hi", "ih", "ho", "oh", "hu", "uh", "hs", "sh",
"la", "al", "le", "el", "li", "il", "lo", "ol", "lu", "ul", "ls", "sl",
"ka", "ak", "ke", "ek", "ki", "ik", "ko", "ok", "ku", "uk", "ks", "sk",
"sa", "as", "se", "es", "si", "is", "so", "os", "su", "us", "ss", "ss",
"ra", "ar", "re", "er", "ri", "ir", "ro", "or", "ru", "ur", "rs", "sr",
"a", "a", "e", "e", "i", "i", "o", "o", "u", "u", "s", "s"
)
icon_state = "lizard"
default_priority = 90

Check failure on line 69 in code/modules/language/draconic.dm

View workflow job for this annotation

GitHub Actions / Run Linters

Check Regex

superflous whitespace added to here, remove or update check_regex.yml

14 changes: 11 additions & 3 deletions code/modules/language/language_holder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,19 @@ Key procs
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/draconic = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/draconic = list(LANGUAGE_ATOM))
/datum/language/draconic = list(LANGUAGE_ATOM),
/datum/language/yeosa = list(LANGUAGE_ATOM))

/datum/language_holder/lizard/ash
selected_language = /datum/language/draconic

/datum/language_holder/yeosa
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/yeosa = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/draconic = list(LANGUAGE_ATOM),
/datum/language/yeosa = list(LANGUAGE_ATOM))

/datum/language_holder/monkey
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/monkey = list(LANGUAGE_ATOM))
Expand Down Expand Up @@ -337,9 +345,9 @@ Key procs

/datum/language_holder/ethereal
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/draconic = list(LANGUAGE_ATOM))
/datum/language/kalixcis = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/draconic = list(LANGUAGE_ATOM))
/datum/language/kalixcis = list(LANGUAGE_ATOM))

/datum/language_holder/fly
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
Expand Down
6 changes: 6 additions & 0 deletions html/changelogs/archive/2023-12.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,9 @@
- admin: ERTs can now have a custom shuttle that they can spawn on, on a toggle
while creating said ERT.
- admin: Shiptest-Specific ERTs, and respective files.
2023-12-17:
Immortalartisan:
- rscadd: A new sandworld ruin based on deprecated ship pubby
unit0016:
- rscadd: A new icemoon ruin has been added, should you be in need of service department
goodies.
Binary file modified icons/effects/mapping_helpers.dmi
Binary file not shown.
Binary file modified icons/runtime/default_title.dmi
Binary file not shown.
Binary file modified icons/title_cards.dmi
Binary file not shown.
Loading