General updates and a few more bug fixes

Constellado · Jul 31, 2024 · c9ed60e · c9ed60e
1 parent 05181a4
commit c9ed60e
Show file tree

Hide file tree

Showing 15 changed files with 85 additions and 19 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
@@ -124,6 +124,7 @@
 /obj/structure/sign/poster/contraband/ambrosia_vulgaris{
 	pixel_y = -32
 	},
+/obj/item/storage/box/syndie_kit/imp_adrenal,
 /turf/open/floor/concrete/slab_1,
 /area/ruin/beach/treasure_cove)
 "ft" = (
@@ -185,6 +186,13 @@
 	},
 /turf/open/water/beach/deep,
 /area/ruin/unpowered)
+"gF" = (
+/obj/effect/turf_decal/weather/dirt{
+	dir = 8
+	},
+/obj/item/disk/design_disk/ammo_1911,
+/turf/open/water/beach,
+/area/ruin/unpowered)
 "hm" = (
 /turf/open/floor/plasteel/stairs{
 	barefootstep = "woodbarefoot";
@@ -511,14 +519,10 @@
 	pixel_y = 7;
 	pixel_x = -3
 	},
-/obj/item/storage/box/syndie_kit/cutouts{
-	pixel_x = 3;
-	pixel_y = 3
-	},
+/obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
-/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/concrete/slab_1,
 /area/ruin/beach/treasure_cove)
 "re" = (
@@ -1528,6 +1532,22 @@
 /obj/item/clothing/under/clip/officer,
 /obj/item/clothing/head/helmet/bulletproof/x11/clip,
 /obj/effect/decal/cleanable/blood/old,
+/obj/item/ammo_box/magazine/p16{
+	pixel_x = -7;
+	pixel_y = 2
+	},
+/obj/item/ammo_box/magazine/p16{
+	pixel_x = -7;
+	pixel_y = 2
+	},
+/obj/item/ammo_box/magazine/p16{
+	pixel_x = -7;
+	pixel_y = 2
+	},
+/obj/item/ammo_box/magazine/p16{
+	pixel_x = -7;
+	pixel_y = 2
+	},
 /turf/open/floor/wood,
 /area/ruin/beach/treasure_cove)
 
@@ -2768,7 +2788,7 @@ ie
 ii
 TN
 TN
-td
+gF
 td
 lt
 An

diff --git a/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm b/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
@@ -745,6 +745,7 @@
 /obj/structure/closet/cabinet,
 /obj/effect/spawner/lootdrop/maintenance,
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/item/storage/box/rndboards,
 /turf/open/floor/plasteel/dark,
 /area/ruin/unpowered/crashed_holemaker)
 "ms" = (

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
@@ -1733,7 +1733,7 @@
 /obj/item/stack/sheet/mineral/hidden/hellstone/ten,
 /obj/item/toy/figure/captain,
 /obj/item/organ/cyberimp/brain/anti_stun,
-/obj/item/disk/design_disk/adv/knight_gear,
+/obj/item/clothing/suit/space/hardsuit/ert/lp/med,
 /turf/open/floor/vault,
 /area/ruin/unpowered/corprejectvault)
 "NJ" = (

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_newcops.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_newcops.dmm
@@ -531,6 +531,7 @@
 	},
 /obj/structure/closet/syndicate,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/blackmarket_uplink,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/powered)
 "yB" = (
@@ -868,6 +869,11 @@
 	icon_state = "wood-broken"
 	},
 /area/ruin/powered)
+"Lv" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/mecha/combat/combat_tank/loaded,
+/turf/open/floor/plating,
+/area/ruin/powered)
 "LA" = (
 /obj/structure/rack,
 /obj/item/clothing/suit/space/syndicate,
@@ -2249,7 +2255,7 @@ IG
 LP
 LP
 LP
-LP
+Lv
 LP
 LP
 LP

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm
@@ -127,7 +127,7 @@
 "iT" = (
 /obj/structure/stone_tile/slab,
 /mob/living/simple_animal/hostile/megafauna/dragon/icemoon{
-	loot = list(/obj/structure/closet/crate/necropolis/dragon,/obj/item/keycard/gatedrop/drakelair);
+	loot = list(/obj/structure/closet/crate/necropolis/dragon,/obj/item/keycard/gatedrop/drakelair)
 	},
 /turf/open/indestructible/boss,
 /area/ruin)

diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
@@ -5790,6 +5790,7 @@
 /obj/item/gun/ballistic/automatic/pistol,
 /obj/item/ammo_box/magazine/m10mm,
 /obj/item/ammo_box/magazine/m10mm,
+/obj/item/card/emag,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/jungle/starport/tower)
 "Nj" = (

diff --git a/_maps/RandomRuins/JungleRuins/jungle_nest.dmm b/_maps/RandomRuins/JungleRuins/jungle_nest.dmm
@@ -62,6 +62,12 @@
 /obj/structure/flora/ausbushes/grassybush,
 /turf/open/floor/plating/dirt/jungle,
 /area/overmap_encounter/planetoid/jungle/explored)
+"gN" = (
+/obj/structure/alien/weeds,
+/obj/effect/decal/cleanable/xenoblood/xgibs/larva/body,
+/obj/structure/alien/egg/grown,
+/turf/open/floor/plating/dirt,
+/area/overmap_encounter/planetoid/cave/explored)
 "gU" = (
 /obj/structure/alien/weeds,
 /obj/effect/decal/remains/xeno,
@@ -234,6 +240,7 @@
 "zz" = (
 /obj/structure/alien/weeds,
 /obj/effect/decal/remains/xeno/larva,
+/obj/structure/alien/egg/grown,
 /turf/open/floor/plating/dirt,
 /area/overmap_encounter/planetoid/cave/explored)
 "AC" = (
@@ -529,7 +536,7 @@ iF
 vt
 vt
 cj
-mW
+gN
 yF
 Hh
 yF

diff --git a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
@@ -861,6 +861,7 @@
 /obj/structure/closet/crate/miningcar,
 /obj/item/resonator,
 /obj/item/t_scanner/adv_mining_scanner/lesser,
+/obj/item/gun/energy/kinetic_accelerator/old,
 /turf/open/floor/plating/dirt/jungle/dark,
 /area/overmap_encounter/planetoid/cave/explored)
 "fz" = (

diff --git a/_maps/RandomRuins/JungleRuins/jungle_seedling.dmm b/_maps/RandomRuins/JungleRuins/jungle_seedling.dmm
@@ -61,6 +61,7 @@
 /obj/item/organ/tongue/robot,
 /obj/item/organ/moth_wings,
 /obj/item/organ/stomach/cybernetic/tier2,
+/obj/item/slimepotion/lovepotion,
 /turf/open/floor/plasteel/freezer,
 /area/ruin/powered)
 "pN" = (

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_comm_outpost.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_comm_outpost.dmm
@@ -48,6 +48,12 @@
 	name = "base floor"
 	},
 /area/ruin/unpowered/syndicate_outpost)
+"kx" = (
+/obj/structure/filingcabinet,
+/turf/open/floor/mineral/plastitanium/red{
+	name = "base floor"
+	},
+/area/ruin/unpowered/syndicate_outpost)
 "ql" = (
 /obj/structure/table/reinforced,
 /turf/open/floor/mineral/plastitanium/red{
@@ -156,6 +162,7 @@
 /area/ruin/unpowered/syndicate_outpost)
 "MK" = (
 /obj/structure/closet/crate/grave/loot,
+/obj/item/implanter/uplink,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/overmap_encounter/planetoid/lava/explored)
 "NT" = (
@@ -366,7 +373,7 @@ RV
 (7,1,1) = {"
 RV
 ho
-js
+kx
 Ts
 js
 Xz

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm
@@ -890,7 +890,7 @@
 /area/overmap_encounter/planetoid/lava/explored)
 "zb" = (
 /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner{
-	loot = list(/obj/item/melee/transforming/cleaving_saw,/obj/item/gun/energy/kinetic_accelerator,/obj/item/keycard/gatedrop/lavacanyon);
+	loot = list(/obj/item/melee/transforming/cleaving_saw,/obj/item/gun/energy/kinetic_accelerator,/obj/item/keycard/gatedrop/lavacanyon)
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/overmap_encounter/planetoid/cave/explored)
@@ -1547,6 +1547,7 @@
 /area/ruin/unpowered/scorched_hut)
 "So" = (
 /obj/structure/closet/crate/necropolis/tendril/greater,
+/obj/item/clothing/suit/space/hardsuit/ert/paranormal,
 /turf/open/indestructible/necropolis,
 /area/overmap_encounter/planetoid/cave/explored)
 "Sy" = (

diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
@@ -997,6 +997,10 @@
 /obj/structure/table,
 /obj/item/gun/ballistic/automatic/smg/skm_carbine,
 /obj/item/ammo_box/magazine/skm_545_39,
+/obj/item/ammo_box/magazine/skm_545_39,
+/obj/item/ammo_box/magazine/skm_545_39,
+/obj/item/ammo_box/magazine/skm_545_39,
+/obj/item/ammo_box/magazine/skm_545_39,
 /turf/open/floor/concrete,
 /area/ruin)
 "Ld" = (

diff --git a/_maps/RandomRuins/SpaceRuins/cryocontainment.dmm b/_maps/RandomRuins/SpaceRuins/cryocontainment.dmm
@@ -191,6 +191,7 @@
 /obj/structure/window/reinforced/survival_pod{
 	dir = 1
 	},
+/obj/item/storage/box/stockparts/t3,
 /turf/open/floor/plasteel/white/airless,
 /area/ruin/unpowered)
 "fE" = (
@@ -1313,6 +1314,7 @@
 /obj/structure/table/reinforced,
 /obj/structure/window/reinforced/survival_pod,
 /obj/item/clothing/glasses/science,
+/obj/item/storage/box/rndboards,
 /turf/open/floor/plasteel/white/airless,
 /area/ruin/unpowered)
 "UL" = (

diff --git a/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm
@@ -222,6 +222,7 @@
 /obj/item/seeds/chili/ice{
 	pixel_x = -5
 	},
+/obj/item/gun_voucher/syndicate,
 /turf/open/floor/plasteel/tech,
 /area/ruin/space/has_grav/syndicircle/winter)
 "gv" = (
@@ -533,7 +534,7 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/deployable_turret,
+/obj/machinery/deployable_turret/hmg,
 /turf/open/floor/mineral/titanium/white,
 /area/ruin/space/has_grav/syndicircle/research)
 "pb" = (
@@ -799,6 +800,7 @@
 /obj/machinery/power/terminal{
 	dir = 1
 	},
+/obj/machinery/vending/security/marine/syndicate,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/syndicircle/halls)
 "wa" = (
@@ -1312,6 +1314,11 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/syndicircle/halls)
+"HF" = (
+/obj/structure/filingcabinet/chestdrawer,
+/obj/item/gun_voucher/syndicate,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ruin/space/has_grav/syndicircle/research)
 "Ik" = (
 /obj/machinery/light/directional/east,
 /turf/open/floor/mineral/plastitanium/red,
@@ -1505,6 +1512,10 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/syndicircle/training)
+"MC" = (
+/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space/stormtrooper,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/syndicircle/halls)
 "MP" = (
 /obj/effect/decal/cleanable/dirt,
 /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space{
@@ -1645,6 +1656,7 @@
 	},
 /obj/item/target/clown,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/gun_voucher/syndicate,
 /turf/open/floor/plating/dirt/jungle/wasteland,
 /area/ruin/space/has_grav/syndicircle/training)
 "Sf" = (
@@ -1893,6 +1905,7 @@
 	},
 /obj/item/ammo_box/magazine/co9mm,
 /obj/item/gun/ballistic/automatic/pistol/commander,
+/obj/item/gun_voucher/syndicate,
 /turf/open/floor/mineral/titanium/blue,
 /area/ruin/space/has_grav/syndicircle/escape)
 "Xf" = (
@@ -3069,7 +3082,7 @@ bL
 aW
 bS
 Dm
-ap
+MC
 at
 am
 MV
@@ -3363,7 +3376,7 @@ ay
 ap
 ay
 ap
-ap
+MC
 ap
 am
 AV
@@ -3375,7 +3388,7 @@ ap
 OE
 am
 ap
-ap
+MC
 ap
 ay
 ap
@@ -3669,7 +3682,7 @@ Li
 ho
 bS
 Dm
-ap
+MC
 at
 Mt
 OW
@@ -4059,7 +4072,7 @@ ay
 UA
 fZ
 pT
-ba
+HF
 bV
 bV
 bV

diff --git a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm
@@ -7380,8 +7380,10 @@
 /obj/structure/sign/poster/retro/lasergun_new{
 	pixel_y = 32
 	},
-/obj/item/stack/telecrystal,
 /obj/effect/turf_decal/box,
+/obj/item/stack/telecrystal/twenty,
+/obj/item/stack/telecrystal/twenty,
+/obj/item/stack/telecrystal/five,
 /turf/open/floor/engine,
 /area/ruin/space/has_grav/singularitylab/lab)
 "Dy" = (