cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 08:36:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into w_class

Browse Source 
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
This commit is contained in:
Mervill
2016-12-02 21:44:24 -08:00
parent 19513c398c ca6ffdba40
commit c2e2440953
95 changed files with 272 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/alien.dm
+1 -1
View File
@@ -10,7 +10,7 @@
gender = FEMALE //All xenos are girls!!
dna = null
faction = list("alien")
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
languages_spoken = ALIEN
languages_understood = ALIEN
sight = SEE_MOBS
code/modules/mob/living/carbon/alien/humanoid/queen.dm
+1 -1
View File
@@ -2,7 +2,7 @@
//Common stuffs for Praetorian and Queen
icon = 'icons/mob/alienqueen.dmi'
status_flags = 0
ventcrawler = 0 //pull over that ass too fat
ventcrawler = VENTCRAWLER_NONE //pull over that ass too fat
unique_name = 0
pixel_x = -16
bubble_icon = "alienroyal"
code/modules/mob/living/carbon/carbon_defines.dm
+1 -1
View File
@@ -31,7 +31,7 @@
var/co2overloadtime = null
var/temperature_resistance = T0C+75
has_limbs = 1
var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/type_of_meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/
var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/type_of_meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
var/list/obj/effect/proc_holder/alien/abilities = list()
var/gib_type = /obj/effect/decal/cleanable/blood/gibs
code/modules/mob/living/carbon/human/species_types.dm
+1 -1
View File
@@ -908,7 +908,7 @@
var/mob/living/carbon/human/H = owner
H.visible_message("<span class='warning'>[H] starts vibrating!</span>", "<span class='danger'>You start charging your bluespace core...</span>")
playsound(get_turf(H), 'sound/weapons/flash.ogg', 25, 1)
addtimer(src, "teleport", 15)
addtimer(src, "teleport", 15, TIMER_NORMAL, H)
/datum/action/innate/unstable_teleport/proc/teleport(mob/living/carbon/human/H)
H.visible_message("<span class='warning'>[H] disappears in a shower of sparks!</span>", "<span class='danger'>You teleport!</span>")
code/modules/mob/living/carbon/monkey/monkey.dm
+1 -1
View File
@@ -8,7 +8,7 @@
pass_flags = PASSTABLE
languages_spoken = MONKEY
languages_understood = MONKEY
ventcrawler = 1
ventcrawler = VENTCRAWLER_NUDE
butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1)
type_of_meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey
gib_type = /obj/effect/decal/cleanable/blood/gibs
code/modules/mob/living/simple_animal/friendly/butterfly.dm
+1 -1
View File
@@ -16,7 +16,7 @@
density = 0
movement_type = FLYING
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
gold_core_spawnable = 2
verb_say = "flutters"
code/modules/mob/living/simple_animal/friendly/cat.dm
+1 -1
View File
@@ -14,7 +14,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
pass_flags = PASSTABLE
mob_size = MOB_SIZE_SMALL
minbodytemp = 200
code/modules/mob/living/simple_animal/friendly/cockroach.dm
+1 -1
View File
@@ -17,7 +17,7 @@
response_disarm = "shoos"
response_harm = "splats"
density = 0
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
gold_core_spawnable = 2
var/squish_chance = 50
loot = list(/obj/effect/decal/cleanable/deadcockroach)
code/modules/mob/living/simple_animal/friendly/crab.dm
+1 -1
View File
@@ -16,7 +16,7 @@
response_harm = "stomps"
stop_automated_movement = 1
friendly = "pinches"
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
var/obj/item/inventory_head
var/obj/item/inventory_mask
gold_core_spawnable = 2
code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+1 -1
View File
@@ -27,7 +27,7 @@
unsuitable_atmos_damage = 0
wander = 0
speed = 0
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
healable = 0
density = 0
pass_flags = PASSTABLE | PASSMOB
code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
+1 -1
View File
@@ -104,7 +104,7 @@
harm_intent_damage = 5
density = TRUE
speed = 1
ventcrawler = 0
ventcrawler = VENTCRAWLER_NONE
faction = list("ratvar")
speak_emote = list("clanks", "clinks", "clunks", "clangs")
verb_ask = "requests"
code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
+1 -1
View File
@@ -140,7 +140,7 @@
hacked = 1
mind.special_role = "hacked drone"
seeStatic = 0 //I MUST SEE THEIR TERRIFIED FACES
ventcrawler = 0 //Again, balance
ventcrawler = VENTCRAWLER_NONE //Again, balance
speed = 1 //gotta go slow
message_admins("[src] ([src.key]) became a hacked drone hellbent on [clockwork ? "serving Ratvar" : "destroying the station"]!")
else
code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+2 -2
View File
@@ -175,7 +175,7 @@
attacktext = "kicks"
health = 3
maxHealth = 3
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
var/amount_grown = 0
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
@@ -226,7 +226,7 @@ var/global/chicken_count = 0
attacktext = "kicks"
health = 15
maxHealth = 15
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
var/eggsleft = 0
var/eggsFertile = TRUE
var/body_color
code/modules/mob/living/simple_animal/friendly/lizard.dm
+1 -1
View File
@@ -14,7 +14,7 @@
response_help = "pets"
response_disarm = "shoos"
response_harm = "stomps on"
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
density = 0
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_SMALL
code/modules/mob/living/simple_animal/friendly/mouse.dm
+1 -1
View File
@@ -18,7 +18,7 @@
response_disarm = "gently pushes aside"
response_harm = "splats"
density = 0
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
var/body_color //brown, gray and white, leave blank for random
code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+1 -1
View File
@@ -42,7 +42,7 @@
var/busy = 0
pass_flags = PASSTABLE
move_to_delay = 6
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
attacktext = "bites"
attack_sound = 'sound/weapons/bite.ogg'
unique_name = 1
code/modules/mob/living/simple_animal/hostile/headcrab.dm
+1 -1
View File
@@ -19,7 +19,7 @@
obj_damage = 0
environment_smash = 0
speak_emote = list("squeaks")
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
var/datum/mind/origin
var/egg_lain = 0
gold_core_spawnable = 1 //are you sure about this??
code/modules/mob/living/simple_animal/hostile/killertomato.dm
+1 -1
View File
@@ -18,7 +18,7 @@
melee_damage_upper = 12
attacktext = "slams"
attack_sound = 'sound/weapons/punch1.ogg'
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
faction = list("plants")
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+1 -1
View File
@@ -608,7 +608,7 @@ Difficulty: Very Hard
density = 0
movement_type = FLYING
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
gold_core_spawnable = 0
verb_say = "warps"
code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+3 -3
View File
@@ -1,4 +1,4 @@
/mob/living/simple_animal/hostile/asteroid/
/mob/living/simple_animal/hostile/asteroid
vision_range = 2
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)
faction = list("mining")
@@ -479,7 +479,7 @@
if(icon_state != icon_aggro)
icon_state = icon_aggro
/obj/effect/goliath_tentacle/
/obj/effect/goliath_tentacle
name = "Goliath tentacle"
icon = 'icons/mob/lavaland/lavaland_monsters.dmi'
icon_state = "Goliath_tentacle"
@@ -875,7 +875,7 @@
response_harm = "squishes"
friendly = "pinches"
a_intent = "help"
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
gold_core_spawnable = 2
stat_attack = 1
gender = NEUTER
code/modules/mob/living/simple_animal/hostile/mushroom.dm
+1 -1
View File
@@ -24,7 +24,7 @@
stat_attack = 2
mouse_opacity = 1
speed = 1
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
robust_searching = 1
unique_name = 1
speak_emote = list("squeaks")
code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
+1 -1
View File
@@ -23,7 +23,7 @@
attack_sound = 'sound/weapons/bite.ogg'
obj_damage = 0
environment_smash = 0
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
movement_type = FLYING
speak_emote = list("squeaks")
code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
+1 -1
View File
@@ -17,7 +17,7 @@
response_disarm = "pokes"
response_harm = "splats"
density = 0
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
faction = list("hostile")
attack_sound = 'sound/effects/Reee.ogg'
butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/nugget = 1)
code/modules/mob/living/simple_animal/hostile/stickman.dm
+1 -1
View File
@@ -29,7 +29,7 @@
faction = list("hostile","stickman")
check_friendly_fire = 1
status_flags = CANPUSH
var/datum/action/boss/wizard_summon_minions/changesummons = /datum/action/boss/wizard_summon_minions/
var/datum/action/boss/wizard_summon_minions/changesummons = /datum/action/boss/wizard_summon_minions
var/summoned_by_wizard = 0
/mob/living/simple_animal/hostile/stickman/ranged
code/modules/mob/living/simple_animal/slime/slime.dm
+1 -1
View File
@@ -9,7 +9,7 @@ var/list/slime_colours = list("rainbow", "grey", "purple", "metal", "orange",
icon = 'icons/mob/slimes.dmi'
icon_state = "grey baby slime"
pass_flags = PASSTABLE
ventcrawler = 2
ventcrawler = VENTCRAWLER_ALWAYS
gender = NEUTER
var/is_adult = 0
var/docile = 0
code/modules/mob/mob.dm
+4
View File
@@ -302,6 +302,10 @@ var/next_mob_id = 0
return
if(AM.anchored || AM.throwing)
return
if(isliving(AM))
var/mob/living/L = AM
if(L.buckled && L.buckled.buckle_prevents_pull)
return
if(throwing || incapacitated())
return
code/modules/mob/mob_movement.dm
+9 -4
View File
@@ -309,14 +309,19 @@
//moves the mob/object we're pulling
/mob/proc/Move_Pulled(atom/A)
if (!pulling)
if(!pulling)
return
if (pulling.anchored || !pulling.Adjacent(src))
if(pulling.anchored || !pulling.Adjacent(src))
stop_pulling()
return
if (A == loc && pulling.density)
if(isliving(pulling))
var/mob/living/L = pulling
if(L.buckled && L.buckled.buckle_prevents_pull) //if they're buckled to something that disallows pulling, prevent it
stop_pulling()
return
if(A == loc && pulling.density)
return
if (!Process_Spacemove(get_dir(pulling.loc, A)))
if(!Process_Spacemove(get_dir(pulling.loc, A)))
return
step(pulling, get_dir(pulling.loc, A))