From 8aa941343bbe158ac19f6c4dbd29bf34c01af88e Mon Sep 17 00:00:00 2001 From: CampinKiller24 Date: Fri, 19 Jan 2024 10:29:12 -0600 Subject: [PATCH] gs --- html/changelogs/CampinKiller24-vlaad2.yml | 43 ++++++ .../dominian_science_vessel.dmm | 130 ++++++++++-------- 2 files changed, 112 insertions(+), 61 deletions(-) create mode 100644 html/changelogs/CampinKiller24-vlaad2.yml diff --git a/html/changelogs/CampinKiller24-vlaad2.yml b/html/changelogs/CampinKiller24-vlaad2.yml new file mode 100644 index 00000000000..db2df31ec96 --- /dev/null +++ b/html/changelogs/CampinKiller24-vlaad2.yml @@ -0,0 +1,43 @@ +################################ +# 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 +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: CampinKiller24 + +# 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: + - tweak: "Adjusted the crew weapons on the Volvalaad science ship." + - rscadd: "Added extra anomaly and xenoarch supplies to the research lab." + - tweak: "Adjusted starboard thrusters so new cans could actually be put in." diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm index 059d84a91eb..5f5601fe52d 100644 --- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm +++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm @@ -13,6 +13,10 @@ /area/shuttle/dominian_science_shuttle) "ada" = ( /obj/effect/floor_decal/corner/purple/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/anomaly_container, /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/research) "aeN" = ( @@ -116,6 +120,9 @@ /obj/effect/floor_decal/corner/red/full{ dir = 8 }, +/obj/item/gun/projectile/pistol/dominia, +/obj/item/ammo_magazine/c45m/dominia, +/obj/item/ammo_magazine/c45m/dominia, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/armory) "arh" = ( @@ -775,11 +782,8 @@ /turf/simulated/floor/tiled/white, /area/shuttle/dominian_science_shuttle) "cwv" = ( -/obj/machinery/light{ - dir = 1; - inserted_light = /obj/item/light/tube/colored/blue; - icon_state = "tube_empty" - }, +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/aft_dock) "cxL" = ( @@ -1191,9 +1195,6 @@ /obj/structure/table/steel, /obj/item/melee/baton, /obj/machinery/recharger, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/effect/floor_decal/corner/purple/full, /obj/machinery/light{ dir = 8; @@ -1221,21 +1222,15 @@ /turf/simulated/wall/shuttle, /area/ship/dominian_science_vessel/showers) "dIe" = ( -/obj/structure/closet/secure_closet/guncabinet{ - name = "Gun Cabinet (SMGs)"; - req_access = list(226) +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/item/gun/projectile/automatic/tommygun/dom, -/obj/item/gun/projectile/automatic/tommygun/dom, -/obj/item/ammo_magazine/submachinemag, -/obj/item/ammo_magazine/submachinemag, -/obj/item/ammo_magazine/submachinemag, -/obj/item/ammo_magazine/submachinemag, -/obj/effect/floor_decal/corner/red{ - dir = 6 +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/ship/dominian_science_vessel/armory) +/obj/structure/anomaly_container, +/turf/simulated/floor/tiled/white, +/area/ship/dominian_science_vessel/research) "dJN" = ( /obj/machinery/power/apc/north{ req_access = list(226) @@ -1264,10 +1259,6 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/dominian_science_shuttle) "dMl" = ( -/obj/structure/table/steel, -/obj/machinery/cell_charger{ - pixel_y = 0 - }, /obj/effect/floor_decal/corner/yellow{ dir = 9 }, @@ -1276,6 +1267,7 @@ inserted_light = /obj/item/light/tube/colored/blue; icon_state = "tube_empty" }, +/obj/structure/closet/toolcloset, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/engineering) "dQg" = ( @@ -3434,8 +3426,11 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/port_hall) "kXV" = ( -/obj/structure/closet/toolcloset, /obj/effect/floor_decal/corner/yellow/full, +/obj/structure/table/steel, +/obj/machinery/cell_charger{ + pixel_y = 0 + }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/engineering) "leu" = ( @@ -3543,9 +3538,7 @@ /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "lul" = ( -/obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/plating, /area/ship/dominian_science_vessel/aft_dock) "lvo" = ( /obj/effect/floor_decal/industrial/outline/emergency_closet, @@ -4734,9 +4727,6 @@ /turf/simulated/floor/airless, /area/ship/dominian_science_vessel/bridge) "pAn" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -4842,6 +4832,7 @@ pixel_y = 32; stand_icon = "banner" }, +/obj/item/flame/lighter, /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/research) "qdb" = ( @@ -4914,6 +4905,7 @@ /obj/effect/floor_decal/corner/purple/full{ dir = 8 }, +/obj/structure/anomaly_container, /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/research) "que" = ( @@ -5242,6 +5234,14 @@ /obj/effect/floor_decal/corner/yellow/full{ dir = 1 }, +/obj/item/stack/material/graphite/full{ + pixel_y = 3; + pixel_x = 5 + }, +/obj/item/stack/material/graphite/full{ + pixel_y = 3; + pixel_x = 5 + }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/engineering) "rDL" = ( @@ -6191,13 +6191,13 @@ /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/research) "vfZ" = ( -/obj/structure/closet/toolcloset, /obj/effect/floor_decal/corner/yellow{ dir = 9 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/closet/toolcloset, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/engineering) "vha" = ( @@ -6591,19 +6591,25 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/bridge) "wCU" = ( -/obj/structure/closet/secure_closet/guncabinet{ - name = "Gun Cabinet (Carbines)"; - req_access = list(226) - }, -/obj/item/gun/projectile/automatic/rifle/dominia_carbine, -/obj/item/gun/projectile/automatic/rifle/dominia_carbine, -/obj/item/ammo_magazine/c762/dominia, -/obj/item/ammo_magazine/c762/dominia, -/obj/item/ammo_magazine/c762/dominia, -/obj/item/ammo_magazine/c762/dominia, /obj/effect/floor_decal/corner/red/full{ dir = 1 }, +/obj/structure/closet/secure_closet/guncabinet{ + name = "Gun Cabinet (SMGs)"; + req_access = list(226) + }, +/obj/item/ammo_magazine/submachinemag, +/obj/item/ammo_magazine/submachinemag, +/obj/item/ammo_magazine/submachinemag, +/obj/item/ammo_magazine/submachinemag, +/obj/item/gun/projectile/automatic/tommygun/dom, +/obj/item/gun/projectile/automatic/tommygun/dom, +/obj/item/ammo_magazine/submachinemag, +/obj/item/ammo_magazine/submachinemag, +/obj/item/ammo_magazine/submachinemag, +/obj/item/ammo_magazine/submachinemag, +/obj/item/gun/projectile/automatic/tommygun/dom, +/obj/item/gun/projectile/automatic/tommygun/dom, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/armory) "wDo" = ( @@ -6676,6 +6682,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/power/emitter, /turf/simulated/floor/tiled/white, /area/ship/dominian_science_vessel/research) "wLq" = ( @@ -6845,6 +6852,11 @@ /area/ship/dominian_science_vessel/hangar) "xiZ" = ( /obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/machinery/light{ + dir = 1; + inserted_light = /obj/item/light/tube/colored/blue; + icon_state = "tube_empty" + }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/aft_dock) "xjp" = ( @@ -7168,12 +7180,8 @@ layer = 2.9 }, /obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, /obj/item/clothing/head/helmet/space/void/dominia, -/obj/item/clothing/head/helmet/space/void/dominia, -/obj/item/clothing/suit/space/void/dominia, /obj/item/clothing/suit/space/void/dominia, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/eva) @@ -32746,7 +32754,7 @@ vuF mUR mUR rta -mUR +sJp dEM xCN bLt @@ -33003,8 +33011,8 @@ vjQ mUR sla arN -mUR sJp +mUR dQg meg meg @@ -33260,8 +33268,8 @@ tEo mUR sla arN -mUR itD +mUR kRn lBn meg @@ -33517,7 +33525,7 @@ lLG mUR sla arN -mUR +dIe pAn nwG lBn @@ -34278,7 +34286,7 @@ xRX xRX xRX doM -uDw +xeU qhl sZn dQP @@ -34535,10 +34543,10 @@ xRX xRX xRX doM -xeU +uDw sci sZn -dQP +cwv mIw sZn vfS @@ -34792,10 +34800,10 @@ xRX xRX xRX doM +lul +lul sZn -sZn -sZn -dQP +cwv coi sZn nVP @@ -35049,9 +35057,9 @@ xRX xRX xRX doM -cwv -lul -lul +sZn +sZn +sZn hHG wPB sZn @@ -36872,7 +36880,7 @@ oBu kQy wCU ntu -dIe +xax tEV xsa bTi