mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +01:00
Merge pull request #46978 from willox/duplicate-variable-stuff
removed a bunch of duplicate member variable definitions and entirely duplicated types
This commit is contained in:
Rob Bailey
@@ -207,14 +207,6 @@
|
||||
name = "Bun (Tight)"
|
||||
icon_state = "hair_tightbun"
|
||||
|
||||
/datum/sprite_accessory/hair/bun2
|
||||
name = "Bun Head 2"
|
||||
icon_state = "hair_bunhead2"
|
||||
|
||||
/datum/sprite_accessory/hair/bun3
|
||||
name = "Bun Head 3"
|
||||
icon_state = "hair_bun3"
|
||||
|
||||
/datum/sprite_accessory/hair/business
|
||||
name = "Business Hair"
|
||||
icon_state = "hair_business"
|
||||
|
||||
@@ -39,12 +39,6 @@
|
||||
message_param = "pings at %t."
|
||||
sound = 'sound/machines/ping.ogg'
|
||||
|
||||
/datum/emote/silicon/chime
|
||||
key = "chime"
|
||||
key_third_person = "chimes"
|
||||
message = "chimes."
|
||||
sound = 'sound/machines/chime.ogg'
|
||||
|
||||
/datum/emote/silicon/sad
|
||||
key = "sad"
|
||||
message = "plays a sad trombone..."
|
||||
|
||||
@@ -32,7 +32,6 @@
|
||||
icon_state = "penguin"
|
||||
icon_living = "penguin"
|
||||
icon_dead = "penguin_dead"
|
||||
butcher_results = list()
|
||||
gold_core_spawnable = FRIENDLY_SPAWN
|
||||
butcher_results = list(/obj/item/organ/ears/penguin = 1, /obj/item/reagent_containers/food/snacks/meat/slab/penguin = 3)
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
emote_hear = list("chitters")
|
||||
speak_chance = 5
|
||||
turns_per_move = 5
|
||||
see_in_dark = 10
|
||||
see_in_dark = 4
|
||||
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/spider = 2, /obj/item/reagent_containers/food/snacks/spiderleg = 8)
|
||||
response_help_continuous = "pets"
|
||||
response_help_simple = "pet"
|
||||
@@ -48,7 +48,6 @@
|
||||
attack_sound = 'sound/weapons/bite.ogg'
|
||||
unique_name = 1
|
||||
gold_core_spawnable = HOSTILE_SPAWN
|
||||
see_in_dark = 4
|
||||
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
|
||||
var/playable_spider = FALSE
|
||||
var/datum/action/innate/spider/lay_web/lay_web
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
desc = "A ground-dwelling, predominantly herbivorous ape that inhabits the forests of central Africa."
|
||||
icon = 'icons/mob/gorilla.dmi'
|
||||
icon_state = "crawling"
|
||||
icon_state = "crawling"
|
||||
icon_living = "crawling"
|
||||
icon_dead = "dead"
|
||||
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
|
||||
|
||||
@@ -660,7 +660,6 @@ Difficulty: Very Hard
|
||||
faction = list("neutral")
|
||||
del_on_death = TRUE
|
||||
unsuitable_atmos_damage = 0
|
||||
movement_type = FLYING
|
||||
minbodytemp = 0
|
||||
maxbodytemp = 1500
|
||||
obj_damage = 0
|
||||
|
||||
@@ -29,7 +29,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
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
friendly_verb_continuous = "wails at"
|
||||
friendly_verb_simple = "wail at"
|
||||
speak_emote = list("bellows")
|
||||
vision_range = 4
|
||||
speed = 3
|
||||
maxHealth = 300
|
||||
health = 300
|
||||
|
||||
@@ -12,12 +12,11 @@
|
||||
attack_verb_continuous = "slashes"
|
||||
attack_verb_simple = "slash"
|
||||
attack_sound = 'sound/weapons/bladeslice.ogg'
|
||||
faction = list("creature")
|
||||
faction = list("nether")
|
||||
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)
|
||||
minbodytemp = 0
|
||||
faction = list("nether")
|
||||
|
||||
/mob/living/simple_animal/hostile/netherworld/migo
|
||||
name = "mi-go"
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
response_help_simple = "brush"
|
||||
response_disarm_continuous = "pushes"
|
||||
response_disarm_simple = "push"
|
||||
faction = list("plants")
|
||||
faction = list("hostile")
|
||||
speed = 1
|
||||
maxHealth = 250
|
||||
health = 250
|
||||
@@ -36,7 +36,6 @@
|
||||
minbodytemp = 0
|
||||
maxbodytemp = 1200
|
||||
|
||||
faction = list("hostile")
|
||||
deathmessage = "is hacked into pieces!"
|
||||
loot = list(/obj/item/stack/sheet/mineral/wood)
|
||||
gold_core_spawnable = HOSTILE_SPAWN
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
attack_verb_simple = "chomp"
|
||||
attack_sound = 'sound/weapons/punch1.ogg'
|
||||
throw_message = "is avoided by the"
|
||||
vision_range = 5
|
||||
aggro_vision_range = 9
|
||||
mob_size = MOB_SIZE_SMALL
|
||||
environment_smash = ENVIRONMENT_SMASH_NONE
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
maxbodytemp = INFINITY
|
||||
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)
|
||||
stop_automated_movement = 1
|
||||
status_flags = 0
|
||||
faction = list("cult")
|
||||
status_flags = CANPUSH
|
||||
movement_type = FLYING
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
maxHealth = 150
|
||||
health = 150
|
||||
healable = 0
|
||||
gender = NEUTER
|
||||
|
||||
see_in_dark = 8
|
||||
|
||||
|
||||
Reference in New Issue
Block a user