mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 19:13:30 +01:00
Removes duplicate definitions in types (#25702)
* Removes duplicate definitions * One more
This commit is contained in:
@@ -5,7 +5,6 @@
|
||||
icon = 'icons/obj/assemblies.dmi'
|
||||
icon_state = "mmi_empty"
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
origin_tech = "biotech=3"
|
||||
origin_tech = "biotech=2;programming=3;engineering=2"
|
||||
|
||||
//Revised. Brainmob is now contained directly within object of transfer. MMI in this case.
|
||||
|
||||
@@ -38,7 +38,6 @@
|
||||
hands_use_check = TRUE
|
||||
|
||||
/datum/emote/living/carbon/human/clap
|
||||
key = "clap"
|
||||
key = "clap"
|
||||
key_third_person = "claps"
|
||||
message = "claps."
|
||||
|
||||
@@ -73,10 +73,9 @@
|
||||
muzzle_ignore = TRUE // makes sure that sound is played upon death
|
||||
bypass_unintentional_cooldown = TRUE // again, this absolutely MUST play when a user dies, if it can.
|
||||
message = "seizes up and falls limp, their eyes dead and lifeless..."
|
||||
message_alien = "seizes up and falls limp, their eyes dead and lifeless..."
|
||||
message_alien = "lets out a waning guttural screech, green blood bubbling from its maw..."
|
||||
message_robot = "shudders violently for a moment before falling still, its eyes slowly darkening."
|
||||
message_AI = "screeches, its screen flickering as its systems slowly halt."
|
||||
message_alien = "lets out a waning guttural screech, green blood bubbling from its maw..."
|
||||
message_larva = "lets out a sickly hiss of air and falls limply to the floor..."
|
||||
message_monkey = "lets out a faint chimper as it collapses and stops moving..."
|
||||
message_simple = "stops moving..."
|
||||
|
||||
@@ -589,7 +589,6 @@ Difficulty: Hard
|
||||
maxHealth = 1
|
||||
alpha = 127.5
|
||||
crusher_loot = null
|
||||
loot = null
|
||||
medal_type = null
|
||||
score_type = null
|
||||
deathmessage = "Explodes into a pool of blood!"
|
||||
|
||||
@@ -48,7 +48,6 @@ Difficulty: Medium
|
||||
enraged_loot = /obj/item/disk/fauna_research/legion
|
||||
vision_range = 13
|
||||
elimination = TRUE
|
||||
appearance_flags = 0
|
||||
mouse_opacity = MOUSE_OPACITY_ICON
|
||||
stat_attack = UNCONSCIOUS // Overriden from /tg/ - otherwise Legion starts chasing its minions
|
||||
appearance_flags = 512
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
a_intent = INTENT_HARM
|
||||
speak_emote = list("chitters")
|
||||
attack_sound = 'sound/weapons/bladeslice.ogg'
|
||||
vision_range = 2
|
||||
aggro_vision_range = 9
|
||||
turns_per_move = 5
|
||||
gold_core_spawnable = HOSTILE_SPAWN
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
ranged_cooldown_time = 120
|
||||
friendly = "wails at"
|
||||
speak_emote = list("bellows")
|
||||
vision_range = 4
|
||||
speed = 3
|
||||
maxHealth = 300
|
||||
health = 300
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
melee_damage_upper = 50
|
||||
attacktext = "chomps"
|
||||
attack_sound = 'sound/weapons/bladeslice.ogg'
|
||||
faction = list("creature")
|
||||
speak_emote = list("screams")
|
||||
gold_core_spawnable = HOSTILE_SPAWN
|
||||
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
icon_living = "clown"
|
||||
icon_dead = "clown_dead"
|
||||
icon_gib = "clown_gib"
|
||||
speak_chance = 0
|
||||
mob_biotypes = MOB_ORGANIC | MOB_HUMANOID
|
||||
turns_per_move = 5
|
||||
response_help = "pokes the"
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
|
||||
speed = -1
|
||||
stop_automated_movement = TRUE
|
||||
status_flags = 0
|
||||
pull_force = 0
|
||||
see_invisible = SEE_INVISIBLE_HIDDEN_RUNES
|
||||
universal_speak = TRUE
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
maxHealth = 150
|
||||
health = 150
|
||||
healable = FALSE
|
||||
gender = NEUTER
|
||||
|
||||
see_in_dark = 8
|
||||
|
||||
|
||||
Reference in New Issue
Block a user