From 5e2c455b69dbd671755d09b3c0b59211a95956ef Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Wed, 16 Feb 2022 18:44:25 -0600 Subject: [PATCH 01/26] Supermatter Spider --- .../living/simple_animal/hostile/smspider.dm | 62 ++++++++++++++++++ icons/mob/smspider.dmi | Bin 0 -> 831 bytes 2 files changed, 62 insertions(+) create mode 100644 code/modules/mob/living/simple_animal/hostile/smspider.dm create mode 100644 icons/mob/smspider.dmi diff --git a/code/modules/mob/living/simple_animal/hostile/smspider.dm b/code/modules/mob/living/simple_animal/hostile/smspider.dm new file mode 100644 index 000000000000..43a7c2a3fd5d --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/smspider.dm @@ -0,0 +1,62 @@ +/mob/living/simple_animal/hostile/smspider + name = "supermatter spider" + desc= "A sliver of supermatter placed upon a robotically enhanced pedestal." + icon = 'icons/mob/smspider.dmi' + icon_state = "smspider" + icon_living = "smspider" + icon_dead = "smspider_dead" + gender = NEUTER + mob_biotypes = MOB_BUG|MOB_ROBOTIC + turns_per_move = 2 + speak_emote = list("vibrates") + emote_see = list("vibrates") + emote_taunt = list("vibrates") + taunt_chance = 40 + combat_mode = TRUE + maxHealth = 10 + health = 10 + minbodytemp = 0 + maxbodytemp = 1500 + healable = 0 + attack_verb_continuous = "slices" + attack_verb_simple = "slice" + attack_sound = 'sound/effects/supermatter.ogg' + attack_vis_effect = ATTACK_EFFECT_CLAW + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) + robust_searching = 1 + faction = list("hostile") + see_in_dark = 8 + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + deathmessage = "falls to the ground, its shard dulling to a miserable grey!" + footstep_type = FOOTSTEP_MOB_CLAW + var/overcharged = FALSE // if true, spider will not die if it dusts a limb + +/mob/living/simple_animal/hostile/smspider/AttackingTarget() + . = ..() + if(isliving(target)) + playsound(get_turf(src), 'sound/effects/supermatter.ogg', 10, TRUE) + visible_message(span_danger("[src] knocks into [target], turning them to dust in a brilliant flash of light!")) + var/mob/living/victim = target + victim.dust() + if(!overcharged) + death() + else if(!isturf(target)) + playsound(get_turf(src), 'sound/effects/supermatter.ogg', 10, TRUE) + visible_message(span_danger("[src] knocks into [target], turning it to dust in a brilliant flash of light!")) + qdel(target) + if(!overcharged) + death() + return FALSE + +/mob/living/simple_animal/hostile/smspider/Initialize(mapload) + . = ..() + AddComponent(/datum/component/swarming) + +/mob/living/simple_animal/hostile/smspider/overcharged + name = "overcharged supermatter spider" + desc = "A sliver of overcharged supermatter placed upon a robotically enhanced pedestal. This one seems especially dangerous." + icon_state = "smspideroc" + icon_living = "smspideroc" + maxHealth = 25 + health = 25 + overcharged = TRUE \ No newline at end of file diff --git a/icons/mob/smspider.dmi b/icons/mob/smspider.dmi new file mode 100644 index 0000000000000000000000000000000000000000..0fc057e0afe7aca50619d2d9f5a82a89801008cb GIT binary patch literal 831 zcmV-F1Hk-=P)V=-0C=2JR&a84_w-Y6@%7{?OD!tS z%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5sW`W|ATuSkNQsLxC9|j) zC}haRnO2mTn+jnQsn8fGnwpbX2@=);LN3nS{Ib;C)Vvbxro^YDCZ-T=XMQrpN(nen zS;5uM1ss3?0W4mJ!bj`60006SNklK#G>#LxZp4FX&E{ZShc5I}tA3xrrGaa92EosXxKLjCl{4J9rKApUa6hY%c> z5X1czg4lr0cRpY9KGIjnzqqjGpL1LgKzvGY=ipB{fquqv;Vtf#INt!^$4~@(zQq#1 zUwH|axF7)d+|1(oF=dU1z-t2JGjB%Z3P=io&v(nbYJ$Q(K1REO!C){LzK3xH2@MA1 zLfYe1DX__aXa%n0I89msWFRu;SuQYMuG2-m1AYHbq&*LE0hbG?j{xldDb6!}%L$~f z7XbTzBKeq<5z&CO31I_~3kd6ZEug-oR6yMC3sOwlBhdUoO{nWRn@0L^Xz>S>P}g&I zTgwGB1ETnYM?ziC*#hziHu!@_!g<-h`8yOwfc(KzLS4__MD!6rfAE~ZO#qDm`vbHn zgAqV~p}f2FmzCRgs}Yn>T(|3{`2>T(U@-h?!2Q2L0Pg>&0VII-f7k#P(D#36K%jvD z`#$eEk3b literal 0 HcmV?d00001 From 8918e7636ee80730167585032df18514bbc6e8a2 Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Wed, 16 Feb 2022 18:55:57 -0600 Subject: [PATCH 02/26] ventcrawling heheh --- code/modules/mob/living/simple_animal/hostile/smspider.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/smspider.dm b/code/modules/mob/living/simple_animal/hostile/smspider.dm index 43a7c2a3fd5d..3edd4f12e46f 100644 --- a/code/modules/mob/living/simple_animal/hostile/smspider.dm +++ b/code/modules/mob/living/simple_animal/hostile/smspider.dm @@ -6,13 +6,11 @@ icon_living = "smspider" icon_dead = "smspider_dead" gender = NEUTER - mob_biotypes = MOB_BUG|MOB_ROBOTIC turns_per_move = 2 speak_emote = list("vibrates") emote_see = list("vibrates") emote_taunt = list("vibrates") taunt_chance = 40 - combat_mode = TRUE maxHealth = 10 health = 10 minbodytemp = 0 @@ -27,6 +25,7 @@ faction = list("hostile") see_in_dark = 8 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + ventcrawler = VENTCRAWLER_ALWAYS deathmessage = "falls to the ground, its shard dulling to a miserable grey!" footstep_type = FOOTSTEP_MOB_CLAW var/overcharged = FALSE // if true, spider will not die if it dusts a limb From 39ff5d6ddb9e6548d993ca1d3501270f3815adfc Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Wed, 2 Mar 2022 09:46:39 -0600 Subject: [PATCH 03/26] FUUUUUUU --- yogstation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/yogstation.dme b/yogstation.dme index e24438c62a06..9cb4beee0e46 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -2457,6 +2457,7 @@ #include "code\modules\mob\living\simple_animal\hostile\pirate.dm" #include "code\modules\mob\living\simple_animal\hostile\russian.dm" #include "code\modules\mob\living\simple_animal\hostile\skeleton.dm" +#include "code\modules\mob\living\simple_animal\hostile\smspider.dm" #include "code\modules\mob\living\simple_animal\hostile\statue.dm" #include "code\modules\mob\living\simple_animal\hostile\stickman.dm" #include "code\modules\mob\living\simple_animal\hostile\syndicate.dm" From fd311dd3a0c444a7ea9e17e1a94da7ed8e26d088 Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Wed, 2 Mar 2022 10:02:31 -0600 Subject: [PATCH 04/26] fix --- code/modules/mob/living/simple_animal/hostile/smspider.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/smspider.dm b/code/modules/mob/living/simple_animal/hostile/smspider.dm index 3edd4f12e46f..52350aa77c05 100644 --- a/code/modules/mob/living/simple_animal/hostile/smspider.dm +++ b/code/modules/mob/living/simple_animal/hostile/smspider.dm @@ -16,10 +16,8 @@ minbodytemp = 0 maxbodytemp = 1500 healable = 0 - attack_verb_continuous = "slices" - attack_verb_simple = "slice" + attacktext = "slices" attack_sound = 'sound/effects/supermatter.ogg' - attack_vis_effect = ATTACK_EFFECT_CLAW atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) robust_searching = 1 faction = list("hostile") @@ -27,7 +25,6 @@ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE ventcrawler = VENTCRAWLER_ALWAYS deathmessage = "falls to the ground, its shard dulling to a miserable grey!" - footstep_type = FOOTSTEP_MOB_CLAW var/overcharged = FALSE // if true, spider will not die if it dusts a limb /mob/living/simple_animal/hostile/smspider/AttackingTarget() From a4d5cacb07230bdaea212752b9e5e847007f6371 Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Sun, 27 Mar 2022 22:57:46 -0500 Subject: [PATCH 05/26] not quite finished yet, one warning to clear up --- code/__DEFINES/admin.dm | 3 ++- code/modules/admin/verbs/randomverbs.dm | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index d83394236f4f..350318de8a4e 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -83,6 +83,7 @@ #define ADMIN_PUNISHMENT_BLEED ":B:loodless" #define ADMIN_PUNISHMENT_PERFORATE ":B:erforate" #define ADMIN_PUNISHMENT_SCARIFY "Scarify" +#define ADMIN_PUNISHMENT_SMSPIDER "Dusting Spider" #define AHELP_ACTIVE 1 #define AHELP_CLOSED 2 @@ -118,4 +119,4 @@ GLOBAL_VAR_INIT(ghost_role_flags, (~0)) //ie pais, posibrains #define GHOSTROLE_SILICONS (1<<3) //ie mafia, ctf -#define GHOSTROLE_MINIGAME (1<<4) \ No newline at end of file +#define GHOSTROLE_MINIGAME (1<<4) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 8754cfef7aa0..c8d111450c7b 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1100,7 +1100,8 @@ Traitors and the like can also be revived with the previous role mostly intact. ADMIN_PUNISHMENT_CRACK, ADMIN_PUNISHMENT_BLEED, ADMIN_PUNISHMENT_PERFORATE, - ADMIN_PUNISHMENT_SCARIFY + ADMIN_PUNISHMENT_SCARIFY, + ADMIN_PUNISHMENT_SMSPIDER ) var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in punishment_list @@ -1190,6 +1191,13 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(target, span_reallybigphobia("HENK!! HENK!! HENK!! YOU DID SOMETHING EXTREMELY DUMB, AND MADE GOD MAD. CRY ABOUT IT.")) var/mob/living/carbon/human/H = target H?.cluwneify() + if(ADMIN_PUNISHMENT_SMSPIDER) + confirm = alert(usr, "Dust target with a spider?", "Confirm? There is no chance of revival!", "Yes", "No") + if(confirm == "Yes") + //This spawns a smspider within five tiles of the target's sight. + var/turf/OV = get_turf(target) + for(OV in oview(target)) + new /mob/living/simple_animal/hostile/smspider if(ADMIN_PUNISHMENT_CRACK) if(!iscarbon(target)) to_chat(usr,span_warning("This must be used on a carbon mob."), confidential = TRUE) @@ -1276,6 +1284,7 @@ Traitors and the like can also be revived with the previous role mostly intact. * * wound_bonus- the wounding power we're assigning to the bullet, since we don't care about the base one * * damage- the damage we're assigning to the bullet, since we don't care about the base one */ + /proc/firing_squad(mob/living/carbon/target, turf/source_turf, body_zone, wound_bonus, damage) if(!target.get_bodypart(body_zone)) return From 4559667b4f1cb8410786b42d31a85b97dce2145e Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Sun, 27 Mar 2022 23:17:09 -0500 Subject: [PATCH 06/26] unsure --- yogstation.dme | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/yogstation.dme b/yogstation.dme index 8fc796ccfa2c..490ae5c030df 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -151,7 +151,6 @@ #include "code\__HELPERS\dates.dm" #include "code\__HELPERS\dna.dm" #include "code\__HELPERS\files.dm" -#include "code\__HELPERS\filters.dm" #include "code\__HELPERS\game.dm" #include "code\__HELPERS\global_lists.dm" #include "code\__HELPERS\heap.dm" @@ -538,7 +537,6 @@ #include "code\datums\diseases\advance\symptoms\sneeze.dm" #include "code\datums\diseases\advance\symptoms\species.dm" #include "code\datums\diseases\advance\symptoms\symptoms.dm" -#include "code\datums\diseases\advance\symptoms\tumors.dm" #include "code\datums\diseases\advance\symptoms\viral.dm" #include "code\datums\diseases\advance\symptoms\vision.dm" #include "code\datums\diseases\advance\symptoms\voice_change.dm" @@ -1138,7 +1136,6 @@ #include "code\game\objects\structures\artstuff.dm" #include "code\game\objects\structures\barsigns.dm" #include "code\game\objects\structures\bedsheet_bin.dm" -#include "code\game\objects\structures\catwalk.dm" #include "code\game\objects\structures\destructible_structures.dm" #include "code\game\objects\structures\displaycase.dm" #include "code\game\objects\structures\divine.dm" @@ -1172,7 +1169,6 @@ #include "code\game\objects\structures\memorial.dm" #include "code\game\objects\structures\mineral_doors.dm" #include "code\game\objects\structures\mirror.dm" -#include "code\game\objects\structures\mjollnir.dm" #include "code\game\objects\structures\mop_bucket.dm" #include "code\game\objects\structures\morgue.dm" #include "code\game\objects\structures\noticeboard.dm" @@ -1316,7 +1312,6 @@ #include "code\modules\admin\verbs\fps.dm" #include "code\modules\admin\verbs\getlogs.dm" #include "code\modules\admin\verbs\ghost_pool_protection.dm" -#include "code\modules\admin\verbs\hiddenprints.dm" #include "code\modules\admin\verbs\individual_logging.dm" #include "code\modules\admin\verbs\machine_upgrade.dm" #include "code\modules\admin\verbs\manipulate_organs.dm" @@ -1337,14 +1332,6 @@ #include "code\modules\admin\verbs\SDQL2\SDQL_2.dm" #include "code\modules\admin\verbs\SDQL2\SDQL_2_parser.dm" #include "code\modules\admin\verbs\SDQL2\SDQL_2_wrappers.dm" -#include "code\modules\admin\view_variables\debug_variables.dm" -#include "code\modules\admin\view_variables\mark_datum.dm" -#include "code\modules\admin\view_variables\massmodvar.dm" -#include "code\modules\admin\view_variables\modifyvariables.dm" -#include "code\modules\admin\view_variables\topic.dm" -#include "code\modules\admin\view_variables\topic_basic.dm" -#include "code\modules\admin\view_variables\topic_list.dm" -#include "code\modules\admin\view_variables\view_variables.dm" #include "code\modules\antagonists\_common\antag_datum.dm" #include "code\modules\antagonists\_common\antag_helpers.dm" #include "code\modules\antagonists\_common\antag_hud.dm" @@ -1372,7 +1359,6 @@ #include "code\modules\antagonists\blob\blobstrains\_reagent.dm" #include "code\modules\antagonists\blob\blobstrains\blazing_oil.dm" #include "code\modules\antagonists\blob\blobstrains\cryogenic_poison.dm" -#include "code\modules\antagonists\blob\blobstrains\distributed_neurons.dm" #include "code\modules\antagonists\blob\blobstrains\electromagnetic_web.dm" #include "code\modules\antagonists\blob\blobstrains\energized_jelly.dm" #include "code\modules\antagonists\blob\blobstrains\explosive_lattice.dm" @@ -2171,7 +2157,6 @@ #include "code\modules\mining\equipment\lazarus_injector.dm" #include "code\modules\mining\equipment\marker_beacons.dm" #include "code\modules\mining\equipment\mineral_scanner.dm" -#include "code\modules\mining\equipment\mining_charges.dm" #include "code\modules\mining\equipment\mining_tools.dm" #include "code\modules\mining\equipment\regenerative_core.dm" #include "code\modules\mining\equipment\resonator.dm" @@ -2182,7 +2167,6 @@ #include "code\modules\mining\laborcamp\laborstacker.dm" #include "code\modules\mining\lavaland\ash_flora.dm" #include "code\modules\mining\lavaland\necropolis_chests.dm" -#include "code\modules\mining\lavaland\world_anvil.dm" #include "code\modules\mining\lavaland\ruins\gym.dm" #include "code\modules\mob\death.dm" #include "code\modules\mob\emote.dm" @@ -2374,7 +2358,6 @@ #include "code\modules\mob\living\silicon\ai\decentralized\projects\examine.dm" #include "code\modules\mob\living\silicon\ai\decentralized\projects\firewall.dm" #include "code\modules\mob\living\silicon\ai\decentralized\projects\induction.dm" -#include "code\modules\mob\living\silicon\ai\decentralized\projects\rgb.dm" #include "code\modules\mob\living\silicon\ai\decentralized\projects\surveillance.dm" #include "code\modules\mob\living\silicon\ai\freelook\cameranet.dm" #include "code\modules\mob\living\silicon\ai\freelook\chunk.dm" @@ -2436,7 +2419,6 @@ #include "code\modules\mob\living\simple_animal\friendly\pet.dm" #include "code\modules\mob\living\simple_animal\friendly\possum.dm" #include "code\modules\mob\living\simple_animal\friendly\sloth.dm" -#include "code\modules\mob\living\simple_animal\friendly\snail.dm" #include "code\modules\mob\living\simple_animal\friendly\snake.dm" #include "code\modules\mob\living\simple_animal\friendly\turtle.dm" #include "code\modules\mob\living\simple_animal\friendly\drone\_drone.dm" @@ -3116,7 +3098,6 @@ #include "code\modules\surgery\organs\stomach.dm" #include "code\modules\surgery\organs\tails.dm" #include "code\modules\surgery\organs\tongue.dm" -#include "code\modules\surgery\organs\tumors.dm" #include "code\modules\surgery\organs\vocal_cords.dm" #include "code\modules\swarmers\swarmer.dm" #include "code\modules\swarmers\swarmer_act.dm" From fbef092ef2cdb517c102187cf65a75eb67409e58 Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Sun, 27 Mar 2022 23:21:14 -0500 Subject: [PATCH 07/26] no idea why that happened --- yogstation.dme | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/yogstation.dme b/yogstation.dme index 490ae5c030df..5edbfb2a591c 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -151,6 +151,7 @@ #include "code\__HELPERS\dates.dm" #include "code\__HELPERS\dna.dm" #include "code\__HELPERS\files.dm" +#include "code\__HELPERS\filters.dm" #include "code\__HELPERS\game.dm" #include "code\__HELPERS\global_lists.dm" #include "code\__HELPERS\heap.dm" @@ -537,6 +538,7 @@ #include "code\datums\diseases\advance\symptoms\sneeze.dm" #include "code\datums\diseases\advance\symptoms\species.dm" #include "code\datums\diseases\advance\symptoms\symptoms.dm" +#include "code\datums\diseases\advance\symptoms\tumors.dm" #include "code\datums\diseases\advance\symptoms\viral.dm" #include "code\datums\diseases\advance\symptoms\vision.dm" #include "code\datums\diseases\advance\symptoms\voice_change.dm" @@ -1136,6 +1138,7 @@ #include "code\game\objects\structures\artstuff.dm" #include "code\game\objects\structures\barsigns.dm" #include "code\game\objects\structures\bedsheet_bin.dm" +#include "code\game\objects\structures\catwalk.dm" #include "code\game\objects\structures\destructible_structures.dm" #include "code\game\objects\structures\displaycase.dm" #include "code\game\objects\structures\divine.dm" @@ -1169,6 +1172,7 @@ #include "code\game\objects\structures\memorial.dm" #include "code\game\objects\structures\mineral_doors.dm" #include "code\game\objects\structures\mirror.dm" +#include "code\game\objects\structures\mjollnir.dm" #include "code\game\objects\structures\mop_bucket.dm" #include "code\game\objects\structures\morgue.dm" #include "code\game\objects\structures\noticeboard.dm" @@ -1312,6 +1316,7 @@ #include "code\modules\admin\verbs\fps.dm" #include "code\modules\admin\verbs\getlogs.dm" #include "code\modules\admin\verbs\ghost_pool_protection.dm" +#include "code\modules\admin\verbs\hiddenprints.dm" #include "code\modules\admin\verbs\individual_logging.dm" #include "code\modules\admin\verbs\machine_upgrade.dm" #include "code\modules\admin\verbs\manipulate_organs.dm" @@ -1332,6 +1337,14 @@ #include "code\modules\admin\verbs\SDQL2\SDQL_2.dm" #include "code\modules\admin\verbs\SDQL2\SDQL_2_parser.dm" #include "code\modules\admin\verbs\SDQL2\SDQL_2_wrappers.dm" +#include "code\modules\admin\view_variables\debug_variables.dm" +#include "code\modules\admin\view_variables\mark_datum.dm" +#include "code\modules\admin\view_variables\massmodvar.dm" +#include "code\modules\admin\view_variables\modifyvariables.dm" +#include "code\modules\admin\view_variables\topic.dm" +#include "code\modules\admin\view_variables\topic_basic.dm" +#include "code\modules\admin\view_variables\topic_list.dm" +#include "code\modules\admin\view_variables\view_variables.dm" #include "code\modules\antagonists\_common\antag_datum.dm" #include "code\modules\antagonists\_common\antag_helpers.dm" #include "code\modules\antagonists\_common\antag_hud.dm" @@ -1359,6 +1372,8 @@ #include "code\modules\antagonists\blob\blobstrains\_reagent.dm" #include "code\modules\antagonists\blob\blobstrains\blazing_oil.dm" #include "code\modules\antagonists\blob\blobstrains\cryogenic_poison.dm" +#include "code\modules\antagonists\blob\blobstrains\debris_devourer.dm" +#include "code\modules\antagonists\blob\blobstrains\distributed_neurons.dm" #include "code\modules\antagonists\blob\blobstrains\electromagnetic_web.dm" #include "code\modules\antagonists\blob\blobstrains\energized_jelly.dm" #include "code\modules\antagonists\blob\blobstrains\explosive_lattice.dm" @@ -2157,6 +2172,7 @@ #include "code\modules\mining\equipment\lazarus_injector.dm" #include "code\modules\mining\equipment\marker_beacons.dm" #include "code\modules\mining\equipment\mineral_scanner.dm" +#include "code\modules\mining\equipment\mining_charges.dm" #include "code\modules\mining\equipment\mining_tools.dm" #include "code\modules\mining\equipment\regenerative_core.dm" #include "code\modules\mining\equipment\resonator.dm" @@ -2167,6 +2183,7 @@ #include "code\modules\mining\laborcamp\laborstacker.dm" #include "code\modules\mining\lavaland\ash_flora.dm" #include "code\modules\mining\lavaland\necropolis_chests.dm" +#include "code\modules\mining\lavaland\world_anvil.dm" #include "code\modules\mining\lavaland\ruins\gym.dm" #include "code\modules\mob\death.dm" #include "code\modules\mob\emote.dm" @@ -2358,6 +2375,7 @@ #include "code\modules\mob\living\silicon\ai\decentralized\projects\examine.dm" #include "code\modules\mob\living\silicon\ai\decentralized\projects\firewall.dm" #include "code\modules\mob\living\silicon\ai\decentralized\projects\induction.dm" +#include "code\modules\mob\living\silicon\ai\decentralized\projects\rgb.dm" #include "code\modules\mob\living\silicon\ai\decentralized\projects\surveillance.dm" #include "code\modules\mob\living\silicon\ai\freelook\cameranet.dm" #include "code\modules\mob\living\silicon\ai\freelook\chunk.dm" @@ -3098,6 +3116,7 @@ #include "code\modules\surgery\organs\stomach.dm" #include "code\modules\surgery\organs\tails.dm" #include "code\modules\surgery\organs\tongue.dm" +#include "code\modules\surgery\organs\tumors.dm" #include "code\modules\surgery\organs\vocal_cords.dm" #include "code\modules\swarmers\swarmer.dm" #include "code\modules\swarmers\swarmer_act.dm" From 54047ed6ef2d6f640855d87960b4d4d6fccb44a5 Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Sun, 27 Mar 2022 23:24:44 -0500 Subject: [PATCH 08/26] afgsaeg --- yogstation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/yogstation.dme b/yogstation.dme index 5edbfb2a591c..f7fa2ec7b499 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -2437,6 +2437,7 @@ #include "code\modules\mob\living\simple_animal\friendly\pet.dm" #include "code\modules\mob\living\simple_animal\friendly\possum.dm" #include "code\modules\mob\living\simple_animal\friendly\sloth.dm" +#include "code\modules\mob\living\simple_animal\friendly\snail.dm" #include "code\modules\mob\living\simple_animal\friendly\snake.dm" #include "code\modules\mob\living\simple_animal\friendly\turtle.dm" #include "code\modules\mob\living\simple_animal\friendly\drone\_drone.dm" From e091b4554f03d0ac247a2a4ec9c1437682381ba3 Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Mon, 28 Mar 2022 01:43:02 -0500 Subject: [PATCH 09/26] another push --- code/__DEFINES/admin.dm | 2 +- code/modules/admin/verbs/randomverbs.dm | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index 350318de8a4e..b846e2104120 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -83,7 +83,7 @@ #define ADMIN_PUNISHMENT_BLEED ":B:loodless" #define ADMIN_PUNISHMENT_PERFORATE ":B:erforate" #define ADMIN_PUNISHMENT_SCARIFY "Scarify" -#define ADMIN_PUNISHMENT_SMSPIDER "Dusting Spider" +#define ADMIN_PUNISHMENT_SMSPIDER "SM Spider" #define AHELP_ACTIVE 1 #define AHELP_CLOSED 2 diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index c8d111450c7b..211a2a5de9f5 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1193,11 +1193,13 @@ Traitors and the like can also be revived with the previous role mostly intact. H?.cluwneify() if(ADMIN_PUNISHMENT_SMSPIDER) confirm = alert(usr, "Dust target with a spider?", "Confirm? There is no chance of revival!", "Yes", "No") - if(confirm == "Yes") + if(confirm == "No") + return + to_chat(usr, span_alert("Dusting target with a spider...")) //This spawns a smspider within five tiles of the target's sight. - var/turf/OV = get_turf(target) - for(OV in oview(target)) - new /mob/living/simple_animal/hostile/smspider + var/turf/open/OV = pick(/turf/open in oview(target,5)) + var/mob/living/loser/ = new /mob/living/simple_animal/hostile/smspider(OV) + loser.attack(target) if(ADMIN_PUNISHMENT_CRACK) if(!iscarbon(target)) to_chat(usr,span_warning("This must be used on a carbon mob."), confidential = TRUE) From 10562e26c867ee12368721ded5439c885f8d6093 Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Mon, 28 Mar 2022 01:50:14 -0500 Subject: [PATCH 10/26] attack_animal --- code/modules/admin/verbs/randomverbs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 211a2a5de9f5..22b2795c846c 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1198,8 +1198,8 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(usr, span_alert("Dusting target with a spider...")) //This spawns a smspider within five tiles of the target's sight. var/turf/open/OV = pick(/turf/open in oview(target,5)) - var/mob/living/loser/ = new /mob/living/simple_animal/hostile/smspider(OV) - loser.attack(target) + var/mob/living/loser/ = new /mob/living/simple_animal/hostile/smspider(OV) + loser.attack_animal(target) if(ADMIN_PUNISHMENT_CRACK) if(!iscarbon(target)) to_chat(usr,span_warning("This must be used on a carbon mob."), confidential = TRUE) From e500faed8b4ec873c7b1e2b7b3f8b4e3b1004e87 Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Mon, 28 Mar 2022 01:52:52 -0500 Subject: [PATCH 11/26] GET OUTTA HERE --- yogstation.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/yogstation.dme b/yogstation.dme index f7fa2ec7b499..8fc796ccfa2c 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -1372,7 +1372,6 @@ #include "code\modules\antagonists\blob\blobstrains\_reagent.dm" #include "code\modules\antagonists\blob\blobstrains\blazing_oil.dm" #include "code\modules\antagonists\blob\blobstrains\cryogenic_poison.dm" -#include "code\modules\antagonists\blob\blobstrains\debris_devourer.dm" #include "code\modules\antagonists\blob\blobstrains\distributed_neurons.dm" #include "code\modules\antagonists\blob\blobstrains\electromagnetic_web.dm" #include "code\modules\antagonists\blob\blobstrains\energized_jelly.dm" From 5334f5b22cdcb83c8e30feeaf17e86de4b87874a Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Mon, 28 Mar 2022 01:59:31 -0500 Subject: [PATCH 12/26] asf --- code/modules/admin/verbs/randomverbs.dm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 22b2795c846c..1192db0db698 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1192,12 +1192,20 @@ Traitors and the like can also be revived with the previous role mostly intact. var/mob/living/carbon/human/H = target H?.cluwneify() if(ADMIN_PUNISHMENT_SMSPIDER) - confirm = alert(usr, "Dust target with a spider?", "Confirm? There is no chance of revival!", "Yes", "No") + var/confirm = alert(usr, "Dust target with a spider?", "Confirm? There is no chance of revival!", "Yes", "No") if(confirm == "No") return to_chat(usr, span_alert("Dusting target with a spider...")) - //This spawns a smspider within five tiles of the target's sight. - var/turf/open/OV = pick(/turf/open in oview(target,5)) + //What's an open turf within the target's sight? + var/list/FOVlist = oview(5,target) + //Let's compile a list of these turfs. + var/list/FOVTurflist = new/list() + //This adds all available open turfs into this list. + for(var/turf/open/item in FOVlist) + FOVTurflist.Add(item) + + //Okay, now we spawn a spider on the turf picked, and have it target the victim. + var/turf/open/OV = pick(FOVTurflist) var/mob/living/loser/ = new /mob/living/simple_animal/hostile/smspider(OV) loser.attack_animal(target) if(ADMIN_PUNISHMENT_CRACK) From 4d10630aac3205aef544631ec915225cb174c4d1 Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Mon, 28 Mar 2022 02:15:28 -0500 Subject: [PATCH 13/26] hurt --- code/modules/admin/verbs/randomverbs.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 1192db0db698..61599cf5486a 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1192,12 +1192,8 @@ Traitors and the like can also be revived with the previous role mostly intact. var/mob/living/carbon/human/H = target H?.cluwneify() if(ADMIN_PUNISHMENT_SMSPIDER) - var/confirm = alert(usr, "Dust target with a spider?", "Confirm? There is no chance of revival!", "Yes", "No") - if(confirm == "No") - return - to_chat(usr, span_alert("Dusting target with a spider...")) //What's an open turf within the target's sight? - var/list/FOVlist = oview(5,target) + var/list/FOVlist = oview(target,5) //Let's compile a list of these turfs. var/list/FOVTurflist = new/list() //This adds all available open turfs into this list. From f50fb9ea05742941140b8838e2781bd4ff81e566 Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Mon, 28 Mar 2022 02:27:43 -0500 Subject: [PATCH 14/26] push --- code/modules/admin/verbs/randomverbs.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 61599cf5486a..580fe2851ce0 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1192,6 +1192,10 @@ Traitors and the like can also be revived with the previous role mostly intact. var/mob/living/carbon/human/H = target H?.cluwneify() if(ADMIN_PUNISHMENT_SMSPIDER) + confirm = alert(usr, "Dust target with a spider?", "Confirm? There is no chance of revival!", "Yes", "No") + if(confirm == "No") + return + to_chat(usr, span_alert("Dusting target with a spider...")) //What's an open turf within the target's sight? var/list/FOVlist = oview(target,5) //Let's compile a list of these turfs. From f613457688ae19f998a7b57542c5300db2f78d6e Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Mon, 28 Mar 2022 02:44:00 -0500 Subject: [PATCH 15/26] new changes --- code/modules/admin/verbs/randomverbs.dm | 37 +++++++++++++------------ 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 580fe2851ce0..e4dd5c1d2ade 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1191,23 +1191,8 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(target, span_reallybigphobia("HENK!! HENK!! HENK!! YOU DID SOMETHING EXTREMELY DUMB, AND MADE GOD MAD. CRY ABOUT IT.")) var/mob/living/carbon/human/H = target H?.cluwneify() - if(ADMIN_PUNISHMENT_SMSPIDER) - confirm = alert(usr, "Dust target with a spider?", "Confirm? There is no chance of revival!", "Yes", "No") - if(confirm == "No") - return - to_chat(usr, span_alert("Dusting target with a spider...")) - //What's an open turf within the target's sight? - var/list/FOVlist = oview(target,5) - //Let's compile a list of these turfs. - var/list/FOVTurflist = new/list() - //This adds all available open turfs into this list. - for(var/turf/open/item in FOVlist) - FOVTurflist.Add(item) - - //Okay, now we spawn a spider on the turf picked, and have it target the victim. - var/turf/open/OV = pick(FOVTurflist) - var/mob/living/loser/ = new /mob/living/simple_animal/hostile/smspider(OV) - loser.attack_animal(target) + if(ADMIN_PUNISHMENT_SMSPIDER) + if(ADMIN_PUNISHMENT_CRACK) if(!iscarbon(target)) to_chat(usr,span_warning("This must be used on a carbon mob."), confidential = TRUE) @@ -1308,6 +1293,24 @@ Traitors and the like can also be revived with the previous role mostly intact. divine_wrath.preparePixelProjectile(target, source_turf) divine_wrath.fire() +/proc/SMspidermission(var/mob/living/target) + var/confirm = alert(usr, "Dust target with a spider?", "Confirm? There is no chance of revival!", "Yes", "No") + if(confirm == "No") + return + to_chat(usr, span_alert("Dusting target with a spider...")) + //What's an open turf within the target's sight? + var/list/FOVlist = oview(target,5) + //Let's compile a list of these turfs. + var/list/FOVTurflist = new/list() + //This adds all available open turfs into this list. + for(var/turf/open/item in FOVlist) + FOVTurflist.Add(item) + + //Okay, now we spawn a spider on the turf picked, and have it target the victim. + var/turf/open/OV = pick(FOVTurflist) + var/mob/living/loser/ = new /mob/living/simple_animal/hostile/smspider(OV) + loser.attack_animal(target) + /client/proc/punish_log(var/whom, var/punishment) var/msg = "[key_name(usr)] punished [key_name_admin(whom)] with [punishment]." //yogs - Yog tickets message_admins(msg) From 3071c69cf893286fae263c94129806cf04e65878 Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Mon, 28 Mar 2022 02:48:14 -0500 Subject: [PATCH 16/26] h --- code/modules/admin/verbs/randomverbs.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index e4dd5c1d2ade..9f055b0c7921 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1192,7 +1192,10 @@ Traitors and the like can also be revived with the previous role mostly intact. var/mob/living/carbon/human/H = target H?.cluwneify() if(ADMIN_PUNISHMENT_SMSPIDER) - + var/confirm = alert(usr, "Dust target with a spider?", "Confirm? There is no chance of revival!", "Yes", "No") + if(confirm == "No") + return + to_chat(usr, span_alert("Dusting target with a spider...")) if(ADMIN_PUNISHMENT_CRACK) if(!iscarbon(target)) to_chat(usr,span_warning("This must be used on a carbon mob."), confidential = TRUE) @@ -1294,10 +1297,6 @@ Traitors and the like can also be revived with the previous role mostly intact. divine_wrath.fire() /proc/SMspidermission(var/mob/living/target) - var/confirm = alert(usr, "Dust target with a spider?", "Confirm? There is no chance of revival!", "Yes", "No") - if(confirm == "No") - return - to_chat(usr, span_alert("Dusting target with a spider...")) //What's an open turf within the target's sight? var/list/FOVlist = oview(target,5) //Let's compile a list of these turfs. From 51f063578c0afa11b7c9df31ea50b4d2442d65b7 Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Mon, 28 Mar 2022 02:55:17 -0500 Subject: [PATCH 17/26] per --- code/modules/admin/verbs/randomverbs.dm | 26 ++++++++++++------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 9f055b0c7921..8394fc8191da 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1195,6 +1195,18 @@ Traitors and the like can also be revived with the previous role mostly intact. var/confirm = alert(usr, "Dust target with a spider?", "Confirm? There is no chance of revival!", "Yes", "No") if(confirm == "No") return + //What's an open turf within the target's sight? + var/list/FOVlist = oview(target,5) + //Let's compile a list of these turfs. + var/list/FOVTurflist = new/list() + //This adds all available open turfs into this list. + for(var/turf/open/item in FOVlist) + FOVTurflist.Add(item) + + //Okay, now we spawn a spider on the turf picked, and have it target the victim. + var/turf/open/OV = pick(FOVTurflist) + var/mob/living/loser/ = new /mob/living/simple_animal/hostile/smspider(OV) + loser.attack_animal(target) to_chat(usr, span_alert("Dusting target with a spider...")) if(ADMIN_PUNISHMENT_CRACK) if(!iscarbon(target)) @@ -1296,20 +1308,6 @@ Traitors and the like can also be revived with the previous role mostly intact. divine_wrath.preparePixelProjectile(target, source_turf) divine_wrath.fire() -/proc/SMspidermission(var/mob/living/target) - //What's an open turf within the target's sight? - var/list/FOVlist = oview(target,5) - //Let's compile a list of these turfs. - var/list/FOVTurflist = new/list() - //This adds all available open turfs into this list. - for(var/turf/open/item in FOVlist) - FOVTurflist.Add(item) - - //Okay, now we spawn a spider on the turf picked, and have it target the victim. - var/turf/open/OV = pick(FOVTurflist) - var/mob/living/loser/ = new /mob/living/simple_animal/hostile/smspider(OV) - loser.attack_animal(target) - /client/proc/punish_log(var/whom, var/punishment) var/msg = "[key_name(usr)] punished [key_name_admin(whom)] with [punishment]." //yogs - Yog tickets message_admins(msg) From 454d81b46621e36783c285d9a006bd1316f3872c Mon Sep 17 00:00:00 2001 From: Xoxeyos <39686570+Xoxeyos@users.noreply.github.com> Date: Mon, 28 Mar 2022 03:11:31 -0500 Subject: [PATCH 18/26] Update code/modules/admin/verbs/randomverbs.dm Co-authored-by: Byemoh --- code/modules/admin/verbs/randomverbs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 8394fc8191da..bd7c7764281a 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1192,7 +1192,7 @@ Traitors and the like can also be revived with the previous role mostly intact. var/mob/living/carbon/human/H = target H?.cluwneify() if(ADMIN_PUNISHMENT_SMSPIDER) - var/confirm = alert(usr, "Dust target with a spider?", "Confirm? There is no chance of revival!", "Yes", "No") + var/confirm = alert(usr, "Dust target with a spider? There is no chance of revival!", "Supermatter Spider", "Yes", "No") if(confirm == "No") return //What's an open turf within the target's sight? From bb7214a61d8d89e531cfe92e32ad2dfc61ed1d14 Mon Sep 17 00:00:00 2001 From: Xoxeyos <39686570+Xoxeyos@users.noreply.github.com> Date: Mon, 28 Mar 2022 03:14:03 -0500 Subject: [PATCH 19/26] Update code/modules/admin/verbs/randomverbs.dm Co-authored-by: Byemoh --- code/modules/admin/verbs/randomverbs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index bd7c7764281a..57043bc1cf87 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1205,7 +1205,7 @@ Traitors and the like can also be revived with the previous role mostly intact. //Okay, now we spawn a spider on the turf picked, and have it target the victim. var/turf/open/OV = pick(FOVTurflist) - var/mob/living/loser/ = new /mob/living/simple_animal/hostile/smspider(OV) + var/mob/living/simple_animal/hostile/smspider/spider = new /mob/living/simple_animal/hostile/smspider(pick(FOVlist)) loser.attack_animal(target) to_chat(usr, span_alert("Dusting target with a spider...")) if(ADMIN_PUNISHMENT_CRACK) From fb6f8ff551aa80abc2bc635af04736e9c5361db5 Mon Sep 17 00:00:00 2001 From: Xoxeyos <39686570+Xoxeyos@users.noreply.github.com> Date: Mon, 28 Mar 2022 03:14:18 -0500 Subject: [PATCH 20/26] Update code/modules/admin/verbs/randomverbs.dm Co-authored-by: Byemoh --- code/modules/admin/verbs/randomverbs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 57043bc1cf87..44b3b08837a7 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1206,7 +1206,7 @@ Traitors and the like can also be revived with the previous role mostly intact. //Okay, now we spawn a spider on the turf picked, and have it target the victim. var/turf/open/OV = pick(FOVTurflist) var/mob/living/simple_animal/hostile/smspider/spider = new /mob/living/simple_animal/hostile/smspider(pick(FOVlist)) - loser.attack_animal(target) + spider.GiveTarget(target) to_chat(usr, span_alert("Dusting target with a spider...")) if(ADMIN_PUNISHMENT_CRACK) if(!iscarbon(target)) From 42bdd35b31366a21421b550bb0361d09be9c998c Mon Sep 17 00:00:00 2001 From: Xoxeyos <39686570+Xoxeyos@users.noreply.github.com> Date: Mon, 28 Mar 2022 03:14:40 -0500 Subject: [PATCH 21/26] Update code/modules/admin/verbs/randomverbs.dm Co-authored-by: Byemoh --- code/modules/admin/verbs/randomverbs.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 44b3b08837a7..9512d398f9ff 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1204,7 +1204,6 @@ Traitors and the like can also be revived with the previous role mostly intact. FOVTurflist.Add(item) //Okay, now we spawn a spider on the turf picked, and have it target the victim. - var/turf/open/OV = pick(FOVTurflist) var/mob/living/simple_animal/hostile/smspider/spider = new /mob/living/simple_animal/hostile/smspider(pick(FOVlist)) spider.GiveTarget(target) to_chat(usr, span_alert("Dusting target with a spider...")) From 2b3648b5c182720601acf6655358de025429de05 Mon Sep 17 00:00:00 2001 From: Xoxeyos <39686570+Xoxeyos@users.noreply.github.com> Date: Mon, 28 Mar 2022 03:14:49 -0500 Subject: [PATCH 22/26] Update code/modules/admin/verbs/randomverbs.dm Co-authored-by: Byemoh --- code/modules/admin/verbs/randomverbs.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 9512d398f9ff..4afba3014635 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1201,7 +1201,6 @@ Traitors and the like can also be revived with the previous role mostly intact. var/list/FOVTurflist = new/list() //This adds all available open turfs into this list. for(var/turf/open/item in FOVlist) - FOVTurflist.Add(item) //Okay, now we spawn a spider on the turf picked, and have it target the victim. var/mob/living/simple_animal/hostile/smspider/spider = new /mob/living/simple_animal/hostile/smspider(pick(FOVlist)) From 7b791293ce6416f28fa41d4dd41dffd2106d09ed Mon Sep 17 00:00:00 2001 From: Xoxeyos <39686570+Xoxeyos@users.noreply.github.com> Date: Mon, 28 Mar 2022 03:14:56 -0500 Subject: [PATCH 23/26] Update code/modules/admin/verbs/randomverbs.dm Co-authored-by: Byemoh --- code/modules/admin/verbs/randomverbs.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 4afba3014635..a698fe6839cc 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1200,7 +1200,6 @@ Traitors and the like can also be revived with the previous role mostly intact. //Let's compile a list of these turfs. var/list/FOVTurflist = new/list() //This adds all available open turfs into this list. - for(var/turf/open/item in FOVlist) //Okay, now we spawn a spider on the turf picked, and have it target the victim. var/mob/living/simple_animal/hostile/smspider/spider = new /mob/living/simple_animal/hostile/smspider(pick(FOVlist)) From 3e0e1275fe668f820cda9ce5148ffc165b47ba1d Mon Sep 17 00:00:00 2001 From: Xoxeyos <39686570+Xoxeyos@users.noreply.github.com> Date: Mon, 28 Mar 2022 03:15:02 -0500 Subject: [PATCH 24/26] Update code/modules/admin/verbs/randomverbs.dm Co-authored-by: Byemoh --- code/modules/admin/verbs/randomverbs.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index a698fe6839cc..91d7c0dec4b2 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1198,7 +1198,6 @@ Traitors and the like can also be revived with the previous role mostly intact. //What's an open turf within the target's sight? var/list/FOVlist = oview(target,5) //Let's compile a list of these turfs. - var/list/FOVTurflist = new/list() //This adds all available open turfs into this list. //Okay, now we spawn a spider on the turf picked, and have it target the victim. From 7e603bf0bc2e4ba54c2c847fa697e9f644f3db17 Mon Sep 17 00:00:00 2001 From: Xoxeyos <39686570+Xoxeyos@users.noreply.github.com> Date: Mon, 28 Mar 2022 03:15:16 -0500 Subject: [PATCH 25/26] Update code/modules/admin/verbs/randomverbs.dm Co-authored-by: Byemoh --- code/modules/admin/verbs/randomverbs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 91d7c0dec4b2..2b97b5b32bee 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1196,7 +1196,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(confirm == "No") return //What's an open turf within the target's sight? - var/list/FOVlist = oview(target,5) + var/FOVlist = circleviewturfs(target,5) //Let's compile a list of these turfs. //This adds all available open turfs into this list. From 6e62358722f9dba5074747cef1a26795ead0742d Mon Sep 17 00:00:00 2001 From: Xoxeyos Date: Mon, 28 Mar 2022 03:36:48 -0500 Subject: [PATCH 26/26] comments changed --- code/modules/admin/verbs/randomverbs.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 2b97b5b32bee..010cf034a4ef 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1195,13 +1195,11 @@ Traitors and the like can also be revived with the previous role mostly intact. var/confirm = alert(usr, "Dust target with a spider? There is no chance of revival!", "Supermatter Spider", "Yes", "No") if(confirm == "No") return - //What's an open turf within the target's sight? + //What's an open turf within the target's sight? Lets make a list of them. var/FOVlist = circleviewturfs(target,5) - //Let's compile a list of these turfs. - //This adds all available open turfs into this list. - - //Okay, now we spawn a spider on the turf picked, and have it target the victim. + //Okay, now we spawn a spider on the turf... var/mob/living/simple_animal/hostile/smspider/spider = new /mob/living/simple_animal/hostile/smspider(pick(FOVlist)) + //And have it target the victim. spider.GiveTarget(target) to_chat(usr, span_alert("Dusting target with a spider...")) if(ADMIN_PUNISHMENT_CRACK)