Big update

- Fixes spiders (I hope?) - Spiders now spawn in groups of 2-8, growing up should be fixed as well.
- Christmas-ifies all the maps
- Minor tweaks all around the stations
- Cleans up the map for central (a lot)
- Adds a new mob to the spawn list in the mines
- Fixes some minor shadekin issues
- Fixes it so borgs/AI can't understand gutter
- Modifies the timing of the radiation storm
- Hopefully fixes the cargo request event. No more buggy gas mixtures.
- Adds a flamboyant crate
- A bunch of other stuff.
This commit is contained in:
IgnusVam
2018-11-29 12:35:52 -07:00
parent 62dfe9216f
commit b0734d5aa1
57 changed files with 1870 additions and 1203 deletions
+20 -10
View File
@@ -126,10 +126,16 @@
layer = HIDING_LAYER
health = 3
var/last_itch = 0
var/amount_grown = -1
var/amount_grown = 0
var/obj/machinery/atmospherics/unary/vent_pump/entry_vent
var/travelling_in_vent = 0
var/list/grow_as = list(/mob/living/simple_animal/hostile/giant_spider, /mob/living/simple_animal/hostile/giant_spider/nurse, /mob/living/simple_animal/hostile/giant_spider/hunter)
var/dormant = FALSE // If dormant, does not add the spiderling to the process list unless it's also growing
var/list/grow_as = list(
/mob/living/simple_animal/hostile/giant_spider,
/mob/living/simple_animal/hostile/giant_spider/nurse,
/mob/living/simple_animal/hostile/giant_spider/hunter
)
/obj/effect/spider/spiderling/frost
grow_as = list(/mob/living/simple_animal/hostile/giant_spider/frost)
@@ -138,8 +144,8 @@
pixel_x = rand(6,-6)
pixel_y = rand(6,-6)
processing_objects |= src
//50% chance to grow up
if(prob(50))
//50% chance to grow up //Chompedit- buffed due to bugs?
if(prob(90))
amount_grown = 1
get_light_and_color(parent)
..()
@@ -172,12 +178,13 @@
else if(entry_vent)
if(get_dist(src, entry_vent) <= 1)
//VOREStation Edit Start
var/obj/machinery/atmospherics/unary/vent_pump/exit_vent = get_safe_ventcrawl_target(entry_vent)
if(!exit_vent)
return
if(1) //To maintain indentation level
// var/obj/machinery/atmospherics/unary/vent_pump/exit_vent = get_safe_ventcrawl_target(entry_vent)
// if(!exit_vent)
// return
// if(1) //To maintain indentation level
//VOREStation Edit End
/* //VOREStation Removal Start - prevent spiders in dorms
//VOREStation Removal Start - prevent spiders in dorms
if(entry_vent.network && entry_vent.network.normal_members.len)
var/list/vents = list()
for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in entry_vent.network.normal_members)
@@ -186,7 +193,10 @@
entry_vent = null
return
var/obj/machinery/atmospherics/unary/vent_pump/exit_vent = pick(vents)
*/ //VOREStation Removal End
//VOREStation Removal End
//Chomp: Removed the removal of the above, as it causes a lot of issues, and doesn't actually stop it from going to the dorms.
/*if(prob(50))
src.visible_message("<B>[src] scrambles into the ventillation ducts!</B>")*/
@@ -214,7 +214,7 @@
R.add_language(LANGUAGE_AKHANI, 1)
R.add_language(LANGUAGE_SKRELLIAN, 1)
R.add_language(LANGUAGE_SKRELLIANFAR, 0)
R.add_language(LANGUAGE_GUTTER, 1)
R.add_language(LANGUAGE_GUTTER, 0)
R.add_language(LANGUAGE_SCHECHI, 1)
R.add_language(LANGUAGE_ROOTLOCAL, 1)
R.add_language(LANGUAGE_TERMINUS, 1)
+4 -2
View File
@@ -13,8 +13,10 @@
/mob/living/simple_animal/hostile/hivebot/swarm = 1,
/mob/living/simple_animal/hostile/carp = 20,
/mob/living/simple_animal/hostile/mimic/crate = 2,
/mob/living/simple_animal/hostile/scarybat = 100,
/mob/living/simple_animal/hostile/scarybat = 70,
/mob/living/simple_animal/hostile/jelly = 25,
/mob/living/simple_animal/hostile/bear = 1,
/mob/living/simple_animal/hostile/goose = 50,
/mob/living/simple_animal/hostile/deathclaw = 1,
/mob/living/simple_animal/hostile/goose = 60,
/mob/living/simple_animal/retaliate/bee = 50,
)
+1 -1
View File
@@ -160,7 +160,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
/mob/living/simple_animal/retaliate/gaslamp = 20,
/mob/living/simple_animal/otie/feral = 10,
/mob/living/simple_animal/hostile/dino/virgo3b = 5,
/mob/living/simple_animal/hostile/dragon/virgo3b = 1
/* /mob/living/simple_animal/hostile/dragon/virgo3b = 1 */ //Chomp: removed for dragon remake
)
/obj/structure/mob_spawner/scanner/xenos
+2 -1
View File
@@ -184,7 +184,8 @@
prob(50);/mob/living/simple_animal/retaliate/gaslamp,
// prob(50);/mob/living/simple_animal/otie/feral, // Removed until Otie code is unfucked.
prob(20);/mob/living/simple_animal/hostile/dino/virgo3b,
prob(1);/mob/living/simple_animal/hostile/dragon/virgo3b)
// prob(1);/mob/living/simple_animal/hostile/dragon/virgo3b //Chomp: removed for dragon remake
)
/obj/random/outside_mob/spawn_item()
. = ..()
@@ -257,6 +257,13 @@
icon_opened = "trashcartopen"
icon_closed = "trashcart"
/obj/structure/closet/crate/gaycrate
name = "rainbow crate"
desc = "It hurts to look at."
icon_state = "rainbowcrate"
icon_opened = "rainbowcrate_open"
icon_closed = "rainbowcrate"
/*these aren't needed anymore
/obj/structure/closet/crate/hat
desc = "A crate filled with Valuable Collector's Hats!."
+9
View File
@@ -0,0 +1,9 @@
/obj/structure/fluff/drake_statue //A neat Ash Drake statue ported over from TG station. - Ignus
name = "drake statue"
desc = "A towering basalt sculpture of a proud and regal drake. Its eyes are six glowing gemstones."
icon = 'icons/obj/64x64.dmi'
icon_state = "dragon_statue"
pixel_x = -16
density = TRUE
// deconstructible = FALSE
layer = OBJ_LAYER