From 4ae0bc1cbd8052c27e35fdec5d2a585f4db56be0 Mon Sep 17 00:00:00 2001 From: Mechoid Date: Tue, 24 Mar 2020 16:06:04 -0700 Subject: [PATCH] Tweaks re: Ater --- code/__defines/xenoarcheaology.dm | 2 +- .../xenoarcheaology/finds/find_spawning.dm | 86 +++++++++---------- html/changelogs/Mechoid - Xenoarch.yml | 40 +++++++++ 3 files changed, 84 insertions(+), 44 deletions(-) create mode 100644 html/changelogs/Mechoid - Xenoarch.yml diff --git a/code/__defines/xenoarcheaology.dm b/code/__defines/xenoarcheaology.dm index 8173032d35..e4b0a3935a 100644 --- a/code/__defines/xenoarcheaology.dm +++ b/code/__defines/xenoarcheaology.dm @@ -40,7 +40,7 @@ #define ARCHAEO_BATTERY 40 #define ARCHAEO_SYRINGE 41 #define ARCHAEO_RING 42 -#define ARCHAEO_BAT 43 +#define ARCHAEO_CLUB 43 #define MAX_ARCHAEO 43 #define DIGSITE_GARDEN 1 diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm index a462d4866a..20f10e91da 100644 --- a/code/modules/xenoarcheaology/finds/find_spawning.dm +++ b/code/modules/xenoarcheaology/finds/find_spawning.dm @@ -32,7 +32,7 @@ //icon_state //item_state switch(find_type) - if(1) + if(ARCHAEO_BOWL) item_type = "bowl" if(prob(33)) new_item = new /obj/item/weapon/reagent_containers/glass/replenishing(src.loc) @@ -46,7 +46,7 @@ new_item.color = rgb(rand(0,255),rand(0,255),rand(0,255)) if(prob(20)) additional_desc = "There appear to be [pick("dark","faintly glowing","pungent","bright")] [pick("red","purple","green","blue")] stains inside." - if(2) + if(ARCHAEO_URN) item_type = "urn" if(prob(33)) new_item = new /obj/item/weapon/reagent_containers/glass/replenishing(src.loc) @@ -58,7 +58,7 @@ apply_image_decorations = 1 if(prob(20)) additional_desc = "It [pick("whispers faintly","makes a quiet roaring sound","whistles softly","thrums quietly","throbs")] if you put it to your ear." - if(3) + if(ARCHAEO_CUTLERY) item_type = "[pick("fork","spoon","knife")]" if(prob(25)) new_item = new /obj/item/weapon/material/kitchen/utensil/fork(src.loc) @@ -71,7 +71,7 @@ additional_desc = "[pick("It's like no [item_type] you've ever seen before",\ "It's a mystery how anyone is supposed to eat with this",\ "You wonder what the creator's mouth was shaped like")]." - if(4) + if(ARCHAEO_STATUETTE) name = "statuette" icon = 'icons/obj/xenoarchaeology.dmi' item_type = "statuette" @@ -82,7 +82,7 @@ if(prob(25)) new_item = new /obj/item/weapon/vampiric(src.loc) LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) - if(5) + if(ARCHAEO_INSTRUMENT) name = "instrument" icon = 'icons/obj/xenoarchaeology.dmi' item_type = "instrument" @@ -93,13 +93,13 @@ "You wonder how many mouths the creator had",\ "You wonder what it sounds like",\ "You wonder what kind of music was made with it")]." - if(6) + if(ARCHAEO_KNIFE) item_type = "[pick("bladed knife","serrated blade","sharp cutting implement")]" new_item = new /obj/item/weapon/material/knife(src.loc) additional_desc = "[pick("It doesn't look safe.",\ "It looks wickedly jagged",\ "There appear to be [pick("dark red","dark purple","dark green","dark blue")] stains along the edges")]." - if(7) + if(ARCHAEO_COIN) //assuming there are 12 types of coins var/chance = 8 for(var/type in typesof(/obj/item/weapon/coin)) @@ -112,11 +112,11 @@ apply_prefix = 0 apply_material_decorations = 0 apply_image_decorations = 1 - if(8) + if(ARCHAEO_HANDCUFFS) item_type = "handcuffs" new_item = new /obj/item/weapon/handcuffs(src.loc) additional_desc = "[pick("They appear to be for securing two things together","Looks kinky","Doesn't seem like a children's toy")]." - if(9) + if(ARCHAEO_BEARTRAP) item_type = "[pick("wicked","evil","byzantine","dangerous")] looking [pick("device","contraption","thing","trap")]" apply_prefix = 0 new_item = new /obj/item/weapon/beartrap(src.loc) @@ -125,13 +125,13 @@ additional_desc = "[pick("It looks like it could take a limb off",\ "Could be some kind of animal trap",\ "There appear to be [pick("dark red","dark purple","dark green","dark blue")] stains along part of it")]." - if(10) + if(ARCHAEO_LIGHTER) item_type = "[pick("cylinder","tank","chamber")]" new_item = new /obj/item/weapon/flame/lighter(src.loc) additional_desc = "There is a tiny device attached." if(prob(30)) apply_image_decorations = 1 - if(11) + if(ARCHAEO_BOX) item_type = "box" new_item = new /obj/item/weapon/storage/box(src.loc) new_item.icon = 'icons/obj/xenoarchaeology.dmi' @@ -143,7 +143,7 @@ if(prob(30)) LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) apply_image_decorations = 1 - if(12) + if(ARCHAEO_GASTANK) item_type = "[pick("cylinder","tank","chamber")]" if(prob(25)) new_item = new /obj/item/weapon/tank/air(src.loc) @@ -153,7 +153,7 @@ new_item = new /obj/item/weapon/tank/phoron(src.loc) icon_state = pick("oxygen","oxygen_fr","oxygen_f","phoron","anesthetic") additional_desc = "It [pick("gloops","sloshes")] slightly when you shake it." - if(13) + if(ARCHAEO_TOOL) item_type = "tool" if(prob(25)) new_item = new /obj/item/weapon/tool/wrench(src.loc) @@ -167,7 +167,7 @@ additional_desc = "[pick("It doesn't look safe.",\ "You wonder what it was used for",\ "There appear to be [pick("dark red","dark purple","dark green","dark blue")] stains on it")]." - if(14) + if(ARCHAEO_METAL) apply_material_decorations = 0 var/list/possible_spawns = list() possible_spawns += /obj/item/stack/material/steel @@ -184,7 +184,7 @@ var/new_type = pick(possible_spawns) new_item = new new_type(src.loc) new_item:amount = rand(5,45) - if(15) + if(ARCHAEO_PEN) if(prob(75)) new_item = new /obj/item/weapon/pen(src.loc) else @@ -194,7 +194,7 @@ icon_state = "pen1" LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) apply_image_decorations = 1 - if(16) + if(ARCHAEO_CRYSTAL) apply_prefix = 0 if(prob(25)) icon = 'icons/obj/xenoarchaeology.dmi' @@ -218,19 +218,19 @@ new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = icon_state LAZYSET(new_item.origin_tech, TECH_ARCANE, 2) - if(17) + if(ARCHAEO_CULTBLADE) //cultblade apply_prefix = 0 new_item = new /obj/item/weapon/melee/cultblade(src.loc) apply_material_decorations = 0 apply_image_decorations = 0 - if(18) + if(ARCHAEO_TELEBEACON) new_item = new /obj/item/device/radio/beacon(src.loc) talkative = 0 new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "unknown[rand(1,4)]" new_item.desc = "" - if(19) + if(ARCHAEO_CLAYMORE) apply_prefix = 0 new_item = new /obj/item/weapon/material/sword(src.loc) new_item.force = 10 @@ -239,7 +239,7 @@ if(prob(30)) new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "blade1" - if(20) + if(ARCHAEO_CULTROBES) //arcane clothing apply_prefix = 0 var/list/possible_spawns = list(/obj/item/clothing/head/culthood, @@ -250,14 +250,14 @@ var/new_type = pick(possible_spawns) new_item = new new_type(src.loc) LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) - if(21) + if(ARCHAEO_SOULSTONE) //soulstone apply_prefix = 0 new_item = new /obj/item/device/soulstone(src.loc) item_type = new_item.name apply_material_decorations = 0 LAZYSET(new_item.origin_tech, TECH_ARCANE, 2) - if(22) + if(ARCHAEO_SHARD) if(prob(50)) new_item = new /obj/item/weapon/material/shard(src.loc) else @@ -265,12 +265,12 @@ apply_prefix = 0 apply_image_decorations = 0 apply_material_decorations = 0 - if(23) + if(ARCHAEO_RODS) apply_prefix = 0 new_item = new /obj/item/stack/rods(src.loc) apply_image_decorations = 0 apply_material_decorations = 0 - if(24) + if(ARCHAEO_STOCKPARTS) var/list/possible_spawns = typesof(/obj/item/weapon/stock_parts) possible_spawns -= /obj/item/weapon/stock_parts possible_spawns -= /obj/item/weapon/stock_parts/subspace @@ -279,13 +279,13 @@ new_item = new new_type(src.loc) item_type = new_item.name apply_material_decorations = 0 - if(25) + if(ARCHAEO_KATANA) apply_prefix = 0 new_item = new /obj/item/weapon/material/sword/katana(src.loc) new_item.force = 10 new_item.name = "katana" item_type = new_item.name - if(26) + if(ARCHAEO_LASER) //energy gun var/spawn_type = pick(\ /obj/item/weapon/gun/energy/laser/practice/xenoarch,\ @@ -313,7 +313,7 @@ new_gun.power_supply.charge = 0 item_type = "gun" - if(27) + if(ARCHAEO_GUN) //revolver var/obj/item/weapon/gun/projectile/new_gun = new /obj/item/weapon/gun/projectile/revolver(src.loc) new_item = new_gun @@ -348,11 +348,11 @@ I.loc = null item_type = "gun" - if(28) + if(ARCHAEO_UNKNOWN) //completely unknown alien device if(prob(50)) apply_image_decorations = 0 - if(29) + if(ARCHAEO_FOSSIL) //fossil bone/skull //new_item = new /obj/item/weapon/fossil/base(src.loc) @@ -366,7 +366,7 @@ additional_desc = "A fossilised part of an alien, long dead." apply_image_decorations = 0 apply_material_decorations = 0 - if(30) + if(ARCHAEO_SHELL) //fossil shell new_item = new /obj/item/weapon/fossil/shell(src.loc) apply_prefix = 0 @@ -375,7 +375,7 @@ apply_material_decorations = 0 if(prob(10)) apply_image_decorations = 1 - if(31) + if(ARCHAEO_PLANT) //fossil plant new_item = new /obj/item/weapon/fossil/plant(src.loc) item_type = new_item.name @@ -383,7 +383,7 @@ apply_image_decorations = 0 apply_material_decorations = 0 apply_prefix = 0 - if(32) + if(ARCHAEO_REMAINS_HUMANOID) //humanoid remains apply_prefix = 0 item_type = "humanoid [pick("remains","skeleton")]" @@ -398,7 +398,7 @@ "The mouth is wide open in a death rictus, the victim would appear to have died screaming.") apply_image_decorations = 0 apply_material_decorations = 0 - if(33) + if(ARCHAEO_REMAINS_ROBOT) //robot remains apply_prefix = 0 item_type = "[pick("mechanical","robotic","cyborg")] [pick("remains","chassis","debris")]" @@ -413,7 +413,7 @@ "A pile of wires and crap metal that looks vaguely robotic.") apply_image_decorations = 0 apply_material_decorations = 0 - if(34) + if(ARCHAEO_REMAINS_XENO) //xenos remains apply_prefix = 0 item_type = "alien [pick("remains","skeleton")]" @@ -429,7 +429,7 @@ "It doesn't look human.") apply_image_decorations = 0 apply_material_decorations = 0 - if(35) + if(ARCHAEO_GASMASK) //gas mask if(prob(25)) new_item = new /obj/item/clothing/mask/gas/poltergeist(src.loc) @@ -438,7 +438,7 @@ new_item = new /obj/item/clothing/mask/gas(src.loc) if(prob(40)) new_item.color = rgb(rand(0,255),rand(0,255),rand(0,255)) - if(36) + if(ARCHAEO_ALIEN_ITEM) // Alien stuff. apply_prefix = FALSE apply_material_decorations = FALSE @@ -471,7 +471,7 @@ LAZYSET(new_item.origin_tech, TECH_PRECURSOR, 1) item_type = new_item.name - if(37) + if(ARCHAEO_ALIEN_BOAT) // Alien boats. apply_prefix = FALSE var/new_boat_mat = pickweight(list( @@ -502,7 +502,7 @@ new_item = new new_type(src.loc, new_boat_mat) item_type = new_item.name - if(38) + if(ARCHAEO_IMPERION_CIRCUIT) // Imperion circuit. apply_prefix = FALSE apply_image_decorations = FALSE @@ -513,7 +513,7 @@ desc = new_item.desc item_type = new_item.name - if(39) + if(ARCHAEO_TELECUBE) // Telecube. if(prob(25)) apply_prefix = FALSE @@ -524,7 +524,7 @@ new_item = new /obj/item/weapon/telecube/randomized(src.loc) item_type = new_item.name - if(40) + if(ARCHAEO_BATTERY) // Battery! var/new_path = pick(subtypesof(/obj/item/weapon/cell)) new_item = new new_path(src.loc) @@ -539,7 +539,7 @@ item_type = new_item.name - if(41) + if(ARCHAEO_SYRINGE) // Syringe. if(prob(25)) apply_prefix = FALSE @@ -555,7 +555,7 @@ item_type = new_item.name - if(42) + if(ARCHAEO_RING) // Ring. if(prob(15)) apply_prefix = FALSE @@ -566,7 +566,7 @@ new_item = new /obj/item/clothing/gloves/ring/material(src.loc) item_type = new_item.name - if(43) + if(ARCHAEO_CLUB) // Baseball Bat if(prob(30)) apply_prefix = FALSE diff --git a/html/changelogs/Mechoid - Xenoarch.yml b/html/changelogs/Mechoid - Xenoarch.yml new file mode 100644 index 0000000000..b3df577d25 --- /dev/null +++ b/html/changelogs/Mechoid - Xenoarch.yml @@ -0,0 +1,40 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Mechoid + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Artifact shields now function properly after fixing a runtime." + - bugfix: "Anomaly batteries function again." + - rscadd: "Archaeology sites can have unique batteries, syringes, rings, and 'clubs'." + - rscadd: "Multiple artifact effects added, in order to provide more spice, from naughty to nice." + - tweak: "Tweaks to normal artifact finds to be more unique."