cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 07:27:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

removes the remaining datum redeclares (#25220)

Browse Source 
* removes the remaining datum redeclares

* the two fixes

* finneee contra

* OK CONTRA

* readd

* CURSED TO BE BROWN!

* facking automerge
This commit is contained in:
GDN
2024-04-21 18:26:35 +00:00
committed by GitHub
parent f83ef617e9
commit 9e6dcf9c46
53 changed files with 105 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/autohiss.dm
-41
View File
@@ -23,47 +23,6 @@
prefs.active_character.autohiss_mode = AUTOHISS_OFF
to_chat(src, "Auto-hiss is now OFF.")
/datum/species/unathi
autohiss_basic_map = list(
"s" = list("ss", "sss", "ssss")
)
autohiss_extra_map = list(
"x" = list("ks", "kss", "ksss")
)
autohiss_exempt = list("Sinta'unathi")
/datum/species/tajaran
autohiss_basic_map = list(
"r" = list("rr", "rrr", "rrrr")
)
autohiss_exempt = list("Siik'tajr")
/datum/species/plasmaman
autohiss_basic_map = list(
"s" = list("ss", "sss", "ssss")
)
/datum/species/kidan
autohiss_basic_map = list(
"z" = list("zz", "zzz", "zzzz"),
"v" = list("vv", "vvv", "vvvv")
)
autohiss_extra_map = list(
"s" = list("z", "zs", "zzz", "zzsz")
)
autohiss_exempt = list("Chittin")
/datum/species/drask
autohiss_basic_map = list(
"o" = list ("oo", "ooo"),
"u" = list ("uu", "uuu")
)
autohiss_extra_map = list(
"m" = list ("mm", "mmm")
)
autohiss_exempt = list("Orluum")
/datum/species/proc/handle_autohiss(message, datum/language/lang, mode)
if(!autohiss_basic_map)
return message
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+4
View File
@@ -1,3 +1,4 @@
#define XENO_TOTAL_LAYERS 6
/mob/living/carbon/alien/humanoid
name = "alien"
icon_state = "alien_s"
@@ -11,6 +12,7 @@
var/alien_slash_damage = 20 //Aliens deal a good amount of damage on harm intent
var/alien_movement_delay = 0 //This can be + or -, how fast an alien moves
var/temperature_resistance = T0C+75
var/list/overlays_standing[XENO_TOTAL_LAYERS]
pass_flags = PASSTABLE
hud_type = /datum/hud/alien
@@ -96,3 +98,5 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list(
/mob/living/carbon/alien/humanoid/get_permeability_protection()
return 0.8
#undef XENO_TOTAL_LAYERS
code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm
-5
View File
@@ -5,12 +5,8 @@
#define X_R_HAND_LAYER 4
#define X_TARGETED_LAYER 5
#define X_FIRE_LAYER 6
#define X_TOTAL_LAYERS 6
/////////////////////////////////
/mob/living/carbon/alien/humanoid
var/list/overlays_standing[X_TOTAL_LAYERS]
/mob/living/carbon/alien/humanoid/update_icons()
overlays.Cut()
for(var/image/I in overlays_standing)
@@ -144,4 +140,3 @@
#undef X_R_HAND_LAYER
#undef X_TARGETED_LAYER
#undef X_FIRE_LAYER
#undef X_TOTAL_LAYERS
code/modules/mob/living/carbon/human/species/drask.dm
+8
View File
@@ -57,6 +57,14 @@
"eyes" = /obj/item/organ/internal/eyes/drask, //5 darksight.
"brain" = /obj/item/organ/internal/brain/drask
)
autohiss_basic_map = list(
"o" = list ("oo", "ooo"),
"u" = list ("uu", "uuu")
)
autohiss_extra_map = list(
"m" = list ("mm", "mmm")
)
autohiss_exempt = list("Orluum")
/datum/species/drask/get_species_runechat_color(mob/living/carbon/human/H)
var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes)
code/modules/mob/living/carbon/human/species/golem.dm
+6 -6
View File
@@ -143,21 +143,21 @@
/datum/species/golem/plasma/on_species_gain(mob/living/carbon/C, datum/species/old_species)
..()
if(ishuman(C))
var/datum/action/innate/ignite/ignite = new()
ignite.Grant(C)
var/datum/action/innate/golem_ignite/golem_ignite = new()
golem_ignite.Grant(C)
/datum/species/golem/plasma/on_species_loss(mob/living/carbon/C)
for(var/datum/action/innate/ignite/ignite in C.actions)
ignite.Remove(C)
for(var/datum/action/innate/golem_ignite/golem_ignite in C.actions)
golem_ignite.Remove(C)
..()
/datum/action/innate/ignite
/datum/action/innate/golem_ignite
name = "Ignite"
desc = "Set yourself aflame, bringing yourself closer to exploding!"
check_flags = AB_CHECK_CONSCIOUS
button_icon_state = "sacredflame"
/datum/action/innate/ignite/Activate()
/datum/action/innate/golem_ignite/Activate()
if(ishuman(owner))
var/mob/living/carbon/human/H = owner
if(H.fire_stacks)
code/modules/mob/living/carbon/human/species/kidan.dm
+8
View File
@@ -47,6 +47,14 @@
"is cracking their exoskeleton!",
"is stabbing themselves with their mandibles!",
"is holding their breath!")
autohiss_basic_map = list(
"z" = list("zz", "zzz", "zzzz"),
"v" = list("vv", "vvv", "vvvv")
)
autohiss_extra_map = list(
"s" = list("z", "zs", "zzz", "zzsz")
)
autohiss_exempt = list("Chittin")
/datum/species/kidan/get_species_runechat_color(mob/living/carbon/human/H)
code/modules/mob/living/carbon/human/species/plasmaman.dm
+3
View File
@@ -47,6 +47,9 @@
speciesbox = /obj/item/storage/box/survival_plasmaman
flesh_color = "#8b3fba"
autohiss_basic_map = list(
"s" = list("ss", "sss", "ssss")
)
/datum/species/plasmaman/before_equip_job(datum/job/J, mob/living/carbon/human/H, visualsOnly = FALSE)
var/current_job = J.title
code/modules/mob/living/carbon/human/species/tajaran.dm
+4
View File
@@ -51,6 +51,10 @@
"is jamming their claws into their eye sockets!",
"is twisting their own neck!",
"is holding their breath!")
autohiss_basic_map = list(
"r" = list("rr", "rrr", "rrrr")
)
autohiss_exempt = list("Siik'tajr")
/datum/species/tajaran/handle_death(gibbed, mob/living/carbon/human/H)
H.stop_tail_wagging()
code/modules/mob/living/carbon/human/species/unathi.dm
+7
View File
@@ -54,6 +54,13 @@
"is jamming their claws into their eye sockets!",
"is twisting their own neck!",
"is holding their breath!")
autohiss_basic_map = list(
"s" = list("ss", "sss", "ssss")
)
autohiss_extra_map = list(
"x" = list("ks", "kss", "ksss")
)
autohiss_exempt = list("Sinta'unathi")
/datum/species/unathi/on_species_gain(mob/living/carbon/human/H)
..()
code/modules/mob/living/silicon/robot/misc_robot_items.dm
-2
View File
@@ -65,8 +65,6 @@
//Personal shielding for the combat module.
/obj/item/borg
var/powerneeded // Percentage of power remaining required to run item
/obj/item/borg/destroyer/mobility
name = "mobility module"
code/modules/mob/living/simple_animal/friendly/dog.dm
-4
View File
@@ -475,10 +475,6 @@
else if(prob(30) && ishuman(movement_target.loc)) // mean hooman has stolen it
custom_emote(EMOTE_VISIBLE, "stares at [movement_target.loc]'s [movement_target] with a sad puppy-face.")
/obj/item/food/snacks/meat/corgi
name = "Corgi meat"
desc = "Tastes like... well you know..."
/mob/living/simple_animal/pet/dog/corgi/Ian/narsie_act()
playsound(src, 'sound/misc/demon_dies.ogg', 75, TRUE)
var/mob/living/simple_animal/pet/dog/corgi/narsie/N = new(loc)
code/modules/mob/new_player/sprite_accessories/human/human_hair.dm
-5
View File
@@ -756,11 +756,6 @@
icon_state = "longovereye"
species_allowed = list("Human", "Slime People", "Unathi", "Tajaran", "Vulpkanin")
/datum/sprite_accessory/hair/father
name = "Father"
icon_state = "father"
species_allowed = list("Human", "Slime People", "Unathi", "Tajaran", "Vulpkanin")
/// Due to a vulp hairstyle called bun
/datum/sprite_accessory/hair/bun4
name = "Bun 4"
code/modules/mob/new_player/sprite_accessories/kidan/kidan_head_accessories.dm
-4
View File
@@ -16,10 +16,6 @@
name = "Curious Antennae"
icon_state = "curious"
/datum/sprite_accessory/head_accessory/kidan/mopey_antennae
name = "Mopey Antennae"
icon_state = "mopey"
/datum/sprite_accessory/head_accessory/kidan/crescent_antennae
name = "Crescent Antennae"
icon_state = "crescent"
code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm
+1 -1
View File
@@ -196,7 +196,7 @@
name = "Mens Grey"
icon_state = "male_grey"
/datum/sprite_accessory/underwear/male/male_grey
/datum/sprite_accessory/underwear/male/male_grey_alt
name = "Mens Grey Alt"
icon_state = "male_greyalt"