Skip to content

Commit 3479a80

Browse files
Revert "Resomi fixes (#1435)"
This reverts commit af1e912.
1 parent af1e912 commit 3479a80

File tree

7 files changed

+3
-31
lines changed

7 files changed

+3
-31
lines changed

code/__defines/culture.dm

-3
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,3 @@
203203

204204
// Phorosian culture
205205
#define CULTURE_PHOROSIAN "Phorosian"
206-
207-
// Resomi culture
208-
#define CULTURE_RESOMI "Resomi"

code/modules/clothing/suits/labcoat.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,4 +197,4 @@
197197
icon_state = "resomi_labcoat_open"
198198
icon_open = "resomi_labcoat_open"
199199
icon_closed = "labcoat_labcoat_closed"
200-
species_restricted = list(SPECIES_RESOMI)
200+
species_restricted = SPECIES_RESOMI

code/modules/culture_descriptor/culture/cultures_resomi.dm

-11
This file was deleted.

code/modules/mob/language/alien/raptor.dm

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/datum/language/resomi
2-
name = LANGUAGE_RESOMI
2+
name = LANGUAGE_SCHECHI
33
desc = "A trilling language spoken by the diminutive Resomi."
44
speech_verb = "chirps"
55
ask_verb = "chirrups"
@@ -13,7 +13,6 @@
1313
"ce", "re", "me", "se", "ne", "te", "le", "she", "sche", "e", "e",
1414
"ci", "ri", "mi", "si", "ni", "ti", "li", "shi", "schi", "i", "i"
1515
)
16-
shorthand = "SCH"
1716

1817
/datum/language/resomi/get_random_name(gender)
19-
return ..(gender, 1, 4, 1.5)
18+
return ..(gender, 1, 4, 1.5)

code/modules/species/station/resomi.dm

-11
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,6 @@
8585
/datum/mob_descriptor/height = -2,
8686
/datum/mob_descriptor/build = -1
8787
)
88-
89-
available_cultural_info = list(
90-
TAG_CULTURE = list(
91-
CULTURE_RESOMI
92-
),
93-
TAG_AMBITION = list(
94-
AMBITION_FREEDOM,
95-
AMBITION_OPPORTUNITY,
96-
AMBITION_KNOWLEDGE
97-
)
98-
)
9988

10089
override_organ_types = list(
10190
BP_R_HAND = /obj/item/organ/external/hand/right/resomi,
-601 Bytes
Binary file not shown.

persistentss13.dme

-2
Original file line numberDiff line numberDiff line change
@@ -1634,7 +1634,6 @@
16341634
#include "code\modules\culture_descriptor\culture\cultures_hidden.dm"
16351635
#include "code\modules\culture_descriptor\culture\cultures_hidden_xenophage.dm"
16361636
#include "code\modules\culture_descriptor\culture\cultures_ipc.dm"
1637-
#include "code\modules\culture_descriptor\culture\cultures_resomi.dm"
16381637
#include "code\modules\culture_descriptor\culture\cultures_serpentid.dm"
16391638
#include "code\modules\culture_descriptor\culture\cultures_skrell.dm"
16401639
#include "code\modules\culture_descriptor\culture\cultures_unathi.dm"
@@ -1953,7 +1952,6 @@
19531952
#include "code\modules\mob\language\alien\gas.dm"
19541953
#include "code\modules\mob\language\alien\lizard.dm"
19551954
#include "code\modules\mob\language\alien\monkey.dm"
1956-
#include "code\modules\mob\language\alien\raptor.dm"
19571955
#include "code\modules\mob\language\alien\skrell.dm"
19581956
#include "code\modules\mob\language\human\arabic.dm"
19591957
#include "code\modules\mob\language\human\chinese.dm"

0 commit comments

Comments
 (0)