From 5fa8d3319362f54d58782888f8b8f2db5112711d Mon Sep 17 00:00:00 2001 From: uraniummeltdown Date: Sun, 22 Jan 2017 07:07:32 +0400 Subject: [PATCH 1/6] tweaked event delay, enabled morph, enabled immovable rod --- code/modules/events/event_container.dm | 12 ++++++++++-- code/modules/events/immovable_rod.dm | 11 ++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm index deaa1b85aa8..c2dc2109cd2 100644 --- a/code/modules/events/event_container.dm +++ b/code/modules/events/event_container.dm @@ -101,8 +101,15 @@ var/list/event_last_fired = list() playercount_modifier = 1 if(26 to 35) playercount_modifier = 0.9 - if(36 to 100000) + if(36 to 50) playercount_modifier = 0.8 + if(50 to 70) + playercount_modifier = 0.7 + if(70 to 90) + playercount_modifier = 0.6 + if(90 to 50000) + playercount_modifier = 0.5 + playercount_modifier = playercount_modifier * delay_modifier var/event_delay = rand(config.event_delay_lower[severity], config.event_delay_upper[severity]) * playercount_modifier @@ -155,6 +162,7 @@ var/list/event_last_fired = list() new /datum/event_meta(EVENT_LEVEL_MODERATE, "Spider Infestation", /datum/event/spider_infestation, 100, list(ASSIGNMENT_SECURITY = 30), 1), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Ion Storm", /datum/event/ion_storm, 0, list(ASSIGNMENT_AI = 50, ASSIGNMENT_CYBORG = 50, ASSIGNMENT_ENGINEER = 15, ASSIGNMENT_SCIENTIST = 5)), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Borer Infestation", /datum/event/borer_infestation, 40, list(ASSIGNMENT_SECURITY = 30), 1), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Immovable Rod", /datum/event/immovable_rod, 0, list(ASSIGNMENT_ENGINEER = 30), 1), //new /datum/event_meta/ninja(EVENT_LEVEL_MODERATE, "Space Ninja", /datum/event/space_ninja, 0, list(ASSIGNMENT_SECURITY = 15), 1), // NON-BAY EVENTS new /datum/event_meta(EVENT_LEVEL_MODERATE, "Mass Hallucination", /datum/event/mass_hallucination, 300), @@ -170,7 +178,7 @@ var/list/event_last_fired = list() new /datum/event_meta(EVENT_LEVEL_MODERATE, "Gravitational Anomaly", /datum/event/anomaly/anomaly_grav, 200), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Revenant", /datum/event/revenant, 150), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Swarmer Spawn", /datum/event/spawn_swarmer, 150, is_one_shot = 1), - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Morph Spawn", /datum/event/spawn_morph, 0, is_one_shot = 1), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Morph Spawn", /datum/event/spawn_morph, 100, is_one_shot = 1), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Disease Outbreak", /datum/event/disease_outbreak, 0, list(ASSIGNMENT_MEDICAL = 150), 1) ) diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index b1a5a0f054a..5c643d95d80 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -11,7 +11,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 announceWhen = 5 /datum/event/immovable_rod/announce() - event_announcement.Announce("What the fuck was that?!", "General Alert") + event_announcement.Announce("Immovable object inbound. Brace for impact.", "Collision Alert") /datum/event/immovable_rod/start() var/startside = pick(cardinal) @@ -34,6 +34,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 loc = start z_original = z destination = end + notify_ghosts("\A [src] is inbound!", source = src) if(end && end.z==z_original) walk_towards(src, destination, 1) @@ -43,7 +44,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 return ..() /obj/effect/immovablerod/ex_act(test) - return 0 + return FALSE /obj/effect/immovablerod/Bump(atom/clong) if(prob(10)) @@ -54,12 +55,12 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 x = clong.x y = clong.y - if(istype(clong, /turf) || istype(clong, /obj)) + if(isturf(clong) || isobj(clong)) if(clong.density) clong.ex_act(2) - else if(istype(clong, /mob)) - if(istype(clong, /mob/living/carbon/human)) + else if(ismob(clong)) + if(ishuman(clong)) var/mob/living/carbon/human/H = clong H.visible_message("[H.name] is penetrated by an immovable rod!" , "The rod penetrates you!" , "You hear a CLANG!") H.adjustBruteLoss(160) From 1eec76088bfa081ef79e4aa3451242a621c116ee Mon Sep 17 00:00:00 2001 From: uraniummeltdown Date: Mon, 23 Jan 2017 21:52:45 +0400 Subject: [PATCH 2/6] tweaked playercount and decreased morph weight --- code/modules/events/event_container.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm index c2dc2109cd2..af407b4a25e 100644 --- a/code/modules/events/event_container.dm +++ b/code/modules/events/event_container.dm @@ -105,9 +105,9 @@ var/list/event_last_fired = list() playercount_modifier = 0.8 if(50 to 70) playercount_modifier = 0.7 - if(70 to 90) + if(70 to 100) playercount_modifier = 0.6 - if(90 to 50000) + if(100 to 50000) playercount_modifier = 0.5 playercount_modifier = playercount_modifier * delay_modifier @@ -178,7 +178,7 @@ var/list/event_last_fired = list() new /datum/event_meta(EVENT_LEVEL_MODERATE, "Gravitational Anomaly", /datum/event/anomaly/anomaly_grav, 200), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Revenant", /datum/event/revenant, 150), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Swarmer Spawn", /datum/event/spawn_swarmer, 150, is_one_shot = 1), - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Morph Spawn", /datum/event/spawn_morph, 100, is_one_shot = 1), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Morph Spawn", /datum/event/spawn_morph, 40, is_one_shot = 1), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Disease Outbreak", /datum/event/disease_outbreak, 0, list(ASSIGNMENT_MEDICAL = 150), 1) ) From c27454497a315cdec9d16cfd9fbaff94016cd843 Mon Sep 17 00:00:00 2001 From: uraniummeltdown Date: Thu, 26 Jan 2017 20:47:16 +0400 Subject: [PATCH 3/6] increased playercount delay --- code/modules/events/event_container.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm index af407b4a25e..18862df22e5 100644 --- a/code/modules/events/event_container.dm +++ b/code/modules/events/event_container.dm @@ -103,12 +103,10 @@ var/list/event_last_fired = list() playercount_modifier = 0.9 if(36 to 50) playercount_modifier = 0.8 - if(50 to 70) + if(50 to 80) playercount_modifier = 0.7 - if(70 to 100) + if(80 to 10000) playercount_modifier = 0.6 - if(100 to 50000) - playercount_modifier = 0.5 playercount_modifier = playercount_modifier * delay_modifier From cd865ac1f2e749f8aefeea22e7abee13161604c0 Mon Sep 17 00:00:00 2001 From: uraniummeltdown Date: Mon, 6 Feb 2017 18:56:23 +0400 Subject: [PATCH 4/6] revert immovable rod announcement change --- code/modules/events/immovable_rod.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index bb474e38593..72718f2243a 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -11,7 +11,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 announceWhen = 5 /datum/event/immovable_rod/announce() - event_announcement.Announce("Unidentified object inbound. Brace for impact.", "Collision Alert") + event_announcement.Announce("What the fuck was that?!", "General Alert") /datum/event/immovable_rod/start() var/startside = pick(cardinal) From bbe7663e21fd6d52e2d3e5880ff6ffbfda910d09 Mon Sep 17 00:00:00 2001 From: uraniummeltdown Date: Mon, 6 Feb 2017 20:22:08 +0400 Subject: [PATCH 5/6] fixed enter_link --- code/modules/events/immovable_rod.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index 72718f2243a..2dc2c8a17dd 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -35,12 +35,18 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 z_original = z destination = end notify_ghosts("\A [src] is inbound!", - enter_link="(Click to follow)", + enter_link="(Click to follow)", source=src, action=NOTIFY_FOLLOW) poi_list |= src if(end && end.z==z_original) walk_towards(src, destination, 1) +/obj/effect/immovablerod/Topic(href, href_list) + if(href_list["follow"]) + var/mob/dead/observer/ghost = usr + if(istype(ghost)) + ghost.ManualFollow(src) + /obj/effect/immovablerod/Destroy() poi_list.Remove(src) return ..() From a8aef396255cc9831db7a35dd33358b7963da0ce Mon Sep 17 00:00:00 2001 From: uraniummeltdown Date: Fri, 10 Feb 2017 17:32:11 +0400 Subject: [PATCH 6/6] enabled slaughter demon event --- code/modules/events/event_container.dm | 1 + code/modules/events/slaughterevent.dm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm index 18862df22e5..90889ef7eba 100644 --- a/code/modules/events/event_container.dm +++ b/code/modules/events/event_container.dm @@ -191,6 +191,7 @@ var/list/event_last_fired = list() new /datum/event_meta(EVENT_LEVEL_MAJOR, "Abductor Visit", /datum/event/abductor, 80, is_one_shot = 1), new /datum/event_meta/alien(EVENT_LEVEL_MAJOR, "Alien Infestation", /datum/event/alien_infestation, 0, list(ASSIGNMENT_SECURITY = 30), 1), new /datum/event_meta(EVENT_LEVEL_MAJOR, "Traders", /datum/event/traders, 0, is_one_shot = 1), + new /datum/event_meta(EVENT_LEVEL_MAJOR, "Slaughter Demon", /datum/event/spawn_slaughter, 15, is_one_shot = 1), ) diff --git a/code/modules/events/slaughterevent.dm b/code/modules/events/slaughterevent.dm index 3a7464baa8c..f46ebcfd605 100644 --- a/code/modules/events/slaughterevent.dm +++ b/code/modules/events/slaughterevent.dm @@ -37,8 +37,8 @@ player_mind.transfer_to(S) player_mind.assigned_role = "Slaughter Demon" player_mind.special_role = SPECIAL_ROLE_SLAUGHTER_DEMON - message_admins("[key_of_slaughter] has been made into a Slaughter Demon by an event.") - log_game("[key_of_slaughter] was spawned as a Slaughter Demon by an event.") + message_admins("[key_name_admin(S)] has been made into a Slaughter Demon by an event.") + log_game("[key_name_admin(S)] was spawned as a Slaughter Demon by an event.") return 1 /datum/event/spawn_slaughter/start()