diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index 26899d9b36c..3400c0f6d9f 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -324,6 +324,21 @@ new /obj/item/clothing/head/dominia/fleet/armsman(src) new /obj/item/clothing/head/dominia/fleet/officer(src) new /obj/item/clothing/suit/storage/dominia/fleet(src) + new /obj/item/clothing/suit/armor/carrier/dominia(src) + new /obj/item/clothing/suit/armor/carrier/dominia(src) + new /obj/item/clothing/suit/armor/carrier/dominia(src) + new /obj/item/clothing/suit/armor/carrier/dominia(src) + new /obj/item/clothing/suit/armor/carrier/dominia(src) + new /obj/item/clothing/accessory/armor_plate/heavy/dominia(src) + new /obj/item/clothing/accessory/armor_plate/heavy/dominia(src) + new /obj/item/clothing/accessory/armor_plate/heavy/dominia(src) + new /obj/item/clothing/accessory/armor_plate/heavy/dominia(src) + new /obj/item/clothing/accessory/armor_plate/heavy/dominia(src) + new /obj/item/clothing/head/helmet/dominia(src) + new /obj/item/clothing/head/helmet/dominia(src) + new /obj/item/clothing/head/helmet/dominia(src) + new /obj/item/clothing/head/helmet/dominia(src) + new /obj/item/clothing/head/helmet/dominia/nco(src) new /obj/item/rig/jinxiang/equipped(src) new /obj/item/clothing/head/helmet/space/void/dominia(src) new /obj/item/clothing/head/helmet/space/void/dominia(src) @@ -371,6 +386,9 @@ new /obj/item/gun/projectile/automatic/rifle/dominia(src) new /obj/item/ammo_magazine/a556(src) new /obj/item/ammo_magazine/a556(src) + new /obj/item/clothing/suit/armor/carrier/dominia(src) + new /obj/item/clothing/accessory/armor_plate/heavy/dominia(src) + new /obj/item/clothing/head/helmet/dominia(src) new /obj/item/melee/energy/sword/pirate(src) new /obj/item/shield/energy/dominia(src) new /obj/item/voidsuit_modkit/dominianvoid(src) diff --git a/code/modules/background/accent/human.dm b/code/modules/background/accent/human.dm index 29975e643be..1a4f6d91763 100644 --- a/code/modules/background/accent/human.dm +++ b/code/modules/background/accent/human.dm @@ -367,7 +367,7 @@ /datum/accent/medina name = ACCENT_MEDINA - description = "Medinan Elyran is characterised by its breathy and almost stutter-step characteristics, both of which are thought to result from the elevated altitudes citizens experience living day-to-day in their \ + description = "Madani Elyran is characterised by its breathy and almost stutter-step characteristics, both of which are thought to result from the elevated altitudes citizens experience living day-to-day in their \ sand-skimming cities. The variation has seen little spread outside Medina itself, owing to the planet's relatively minimal footprint on Elyran cinema and television." tag_icon = "medina" text_tag = "MED" diff --git a/code/modules/clothing/factions/elyra.dm b/code/modules/clothing/factions/elyra.dm index cade39f0b15..a2839f23f5f 100644 --- a/code/modules/clothing/factions/elyra.dm +++ b/code/modules/clothing/factions/elyra.dm @@ -1,6 +1,6 @@ /obj/item/clothing/under/elyra_holo name = "elyran holographic suit" - desc = "A marvel of Elyran technology, uses hardlight fabric and masks to transform a skin-tight, cozy suit into cultural apparel of your choosing. Has a dial for Midenean, Aemaqii and Persepolisean clothes respectively." + desc = "A marvel of Elyran technology, uses hardlight fabric and masks to transform a skin-tight, cozy suit into cultural apparel of your choosing. Has a dial for Madani, Aemaqii and Persepolisean clothes respectively." icon = 'icons/clothing/under/uniforms/elyra_holoclothes.dmi' icon_state = "holosuit_fem" item_state = "holosuit_fem" @@ -10,13 +10,13 @@ var/clothing_mode = 0 var/list/names = list( "base holographic suit", - "medinean artisans holo-dress", + "madani artisans holo-dress", "aemaqii ocean holo-dress", "persepolisean desert holo-dress" ) var/list/descriptions = list( - "A form-fitting holographic dress with striking purple and white coloration. It possesses high-fidelity, artistic representation of Elyran Medinean culture markers coating its tightly-woven hardlight fabric.", + "A form-fitting holographic dress with striking purple and white coloration. It possesses high-fidelity, artistic representation of Elyran Madani culture markers coating its tightly-woven hardlight fabric.", "A fine holo-dress which owes its overall design to the chemical seas of Aemaqq, with itself flowing gently in waves. It looks particularly cozy, and protective against a cold ocean breeze.", "A loose, airy holo-dress with clashing earthen and bright colors. The design is iconic among the Elyran Persepolisean native populations due to its expressive contrast and the hot climate." ) @@ -26,7 +26,7 @@ item_state = "holosuit_masc" names = list( "base holographic suit", - "medinean artisans holo-suit", + "madani artisans holo-suit", "aemaqii fur outfit", "persepolisean nomads outfit" ) diff --git a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm index bf3281410e7..a040e80c8d3 100644 --- a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm +++ b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm @@ -56,7 +56,7 @@ breath_eff_mul = 6 // 1/6 * breath_eff_mul = fraction of gas consumed poison_type = GAS_NITROGEN //a species that breathes plasma shouldn't be poisoned by it. breathing_sound = null //They don't work that way I guess? I'm a coder not a purple man. - mob_size = 13 //their half an inch thick exoskeleton and impressive height, plus all of their mechanical organs. + mob_size = 10 //their half an inch thick exoskeleton and impressive height, plus all of their mechanical organs. natural_climbing = TRUE climb_coeff = 0.75 diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 0b9acdc2ac2..1fc0ff9e068 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -119,7 +119,7 @@ /obj/item/gun/projectile/automatic/wt550 name = "machine pistol" - desc = "The NI 550 Saber is a cheap self-defense weapon, mass-produced by Zavodskoi Interstellar for paramilitary and private use." + desc = "The ZI 550 Saber is a cheap self-defense weapon, mass-produced by Zavodskoi Interstellar for paramilitary and private use." icon = 'icons/obj/guns/wt550.dmi' icon_state = "wt550" item_state = "wt550" diff --git a/html/changelogs/Lavillastrangiato - bugfixes.yml b/html/changelogs/Lavillastrangiato - bugfixes.yml new file mode 100644 index 00000000000..602cdc7ce65 --- /dev/null +++ b/html/changelogs/Lavillastrangiato - bugfixes.yml @@ -0,0 +1,62 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Lavillastrangiato + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Gives the civvie yacht crew IDs." + - bugfix: "Fixes access problems on the Headmaster ship." + - bugfix: "Fixes some typoes in the ZI machine pistol and various Medina stuff." + - bugfix: "Fixes Vaurca workers causing quakes when they jump." + - bugfix: "Adds Dominian armor and helmets to their gear crates." diff --git a/icons/clothing/backpacks/dominia_backpack.dmi b/icons/clothing/backpacks/dominia_backpack.dmi index 83f1a864b4a..fc066250901 100644 Binary files a/icons/clothing/backpacks/dominia_backpack.dmi and b/icons/clothing/backpacks/dominia_backpack.dmi differ diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dmm b/maps/away/ships/pra/headmaster/headmaster_ship.dmm index 2d8e69fcd69..deb2a0c841d 100644 --- a/maps/away/ships/pra/headmaster/headmaster_ship.dmm +++ b/maps/away/ships/pra/headmaster/headmaster_ship.dmm @@ -518,7 +518,9 @@ /turf/simulated/floor/plating/cooled, /area/headmaster_ship/engine) "bg" = ( -/obj/machinery/power/apc/south, +/obj/machinery/power/apc/south{ + req_access = list(209) + }, /obj/structure/cable/green, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -1067,8 +1069,7 @@ /area/headmaster_ship/engine) "cM" = ( /obj/structure/closet/secure_closet/engineering_welding{ - req_access = null; - req_one_access = list(113) + req_access = list(209) }, /obj/effect/floor_decal/corner/yellow{ dir = 10 @@ -2947,7 +2948,9 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/power/apc/high/east, +/obj/machinery/power/apc/high/east{ + req_access = list(209) + }, /obj/structure/cable/green{ d2 = 8; icon_state = "0-8" @@ -3722,7 +3725,9 @@ }, /area/headmaster_ship/mess_hall) "lp" = ( -/obj/machinery/power/apc/high/north, +/obj/machinery/power/apc/high/north{ + req_access = list(209) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, diff --git a/maps/away/ships/yacht_civ/yacht_civ_ghostroles.dm b/maps/away/ships/yacht_civ/yacht_civ_ghostroles.dm index 4d5e3ab260c..ff837f2454b 100644 --- a/maps/away/ships/yacht_civ/yacht_civ_ghostroles.dm +++ b/maps/away/ships/yacht_civ/yacht_civ_ghostroles.dm @@ -28,4 +28,9 @@ uniform = list(/obj/item/clothing/under/pj/red, /obj/item/clothing/under/pj/blue) wrist = list(/obj/item/clothing/wrists/watch/silver, /obj/item/clothing/wrists/watch/gold) l_ear = /obj/item/device/radio/headset/ship - id = /obj/item/storage/wallet/sol_rich + l_pocket = /obj/item/storage/wallet/sol_rich + id = /obj/item/card/id/yacht_civ + +/obj/item/card/id/yacht_civ + name = "\improper Civilian yacht identification card" + access = list(ACCESS_EXTERNAL_AIRLOCKS)