Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
Browse files Browse the repository at this point in the history
…to ci-improvments
  • Loading branch information
FalloutFalcon committed Oct 15, 2024
2 parents bfddfdc + f691adb commit 81b86b4
Show file tree
Hide file tree
Showing 201 changed files with 3,043 additions and 3,958 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@
name = "charge rifle"
},
/obj/item/gun/energy/lasercannon{
pixel_y = 5;
pixel_y = 5
},
/obj/item/gun/energy/lasercannon,
/obj/effect/turf_decal/industrial/hatch,
Expand Down
46 changes: 23 additions & 23 deletions _maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@
},
/turf/open/water/beach/deep,
/area/overmap_encounter/planetoid/beachplanet/explored)
"eB" = (
/obj/item/storage/box/ammo/c38,
/obj/structure/closet/crate/wooden,
/turf/open/floor/wood,
/area/ruin/beach)
"eJ" = (
/obj/effect/turf_decal/siding/wood{
dir = 5
Expand Down Expand Up @@ -200,12 +205,6 @@
/obj/structure/railing/corner,
/turf/open/water/beach/deep,
/area/overmap_encounter/planetoid/beachplanet/explored)
"kj" = (
/obj/structure/closet/cabinet,
/obj/item/pneumatic_cannon/speargun,
/obj/item/melee/knife/hunting,
/turf/open/floor/wood,
/area/ruin/beach)
"kr" = (
/obj/effect/turf_decal/weather/sand/corner{
dir = 1
Expand Down Expand Up @@ -280,11 +279,6 @@
},
/turf/open/floor/plating/asteroid/sand,
/area/overmap_encounter/planetoid/cave/explored)
"mq" = (
/obj/item/ammo_box/c38_box,
/obj/structure/closet/crate/wooden,
/turf/open/floor/wood,
/area/ruin/beach)
"my" = (
/obj/effect/turf_decal/weather/sand{
dir = 5
Expand Down Expand Up @@ -745,12 +739,27 @@
},
/turf/open/floor/wood/ebony,
/area/overmap_encounter/planetoid/beachplanet/explored)
"CJ" = (
/obj/structure/closet/cabinet,
/obj/item/pneumatic_cannon/speargun,
/obj/item/melee/knife/hunting,
/obj/machinery/light/small/directional/east{
light_color = "#d8b1b1"
},
/turf/open/floor/wood,
/area/ruin/beach)
"CV" = (
/obj/machinery/grill,
/obj/effect/turf_decal/corner/opaque/pink/diagonal,
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plastic,
/area/ruin/beach)
"DG" = (
/obj/structure/closet/cabinet,
/obj/item/pneumatic_cannon/speargun,
/obj/item/melee/knife/hunting,
/turf/open/floor/wood,
/area/ruin/beach)
"DL" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
Expand Down Expand Up @@ -1047,15 +1056,6 @@
/obj/effect/turf_decal/siding/white/corner,
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
"PB" = (
/obj/structure/closet/cabinet,
/obj/item/pneumatic_cannon/speargun,
/obj/item/melee/knife/hunting,
/obj/machinery/light/small/directional/east{
light_color = "#d8b1b1"
},
/turf/open/floor/wood,
/area/ruin/beach)
"PC" = (
/obj/effect/turf_decal/weather/sand{
dir = 10
Expand Down Expand Up @@ -2186,9 +2186,9 @@ sz
ut
Ty
oS
mq
kj
PB
eB
DG
CJ
ut
BW
BN
Expand Down
9 changes: 2 additions & 7 deletions _maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -666,13 +666,8 @@
/obj/structure/table/reinforced{
color = "#c1b6a5"
},
/obj/item/ammo_box/c38_box{
pixel_x = 10;
pixel_y = 8
},
/obj/item/ammo_box/c38_box{
pixel_x = 10
},
/obj/item/storage/box/ammo/c38,
/obj/item/storage/box/ammo/c38,
/obj/structure/sign/poster/contraband/energy_swords{
pixel_x = -32
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@
"EF" = (
/obj/effect/decal/cleanable/blood/gibs/torso,
/obj/structure/safe,
/obj/item/ammo_box/a12g/slug,
/obj/item/storage/box/ammo/a12g_slug,
/obj/item/melee/knife/combat,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3050,7 +3050,7 @@
/obj/item/clothing/under/rank/security/officer/blueshirt,
/obj/item/clothing/gloves/combat,
/obj/item/clothing/shoes/jackboots,
/obj/item/ammo_box/c9mm,
/obj/item/storage/box/ammo/c9mm,
/obj/machinery/light/small/broken/directional/north,
/obj/effect/turf_decal/corner/transparent/bar/three_quarters{
dir = 4
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
name = "armory locker";
req_one_access_txt = "1"
},
/obj/item/ammo_box/a12g,
/obj/item/storage/box/ammo/a12g_buckshot,
/turf/open/floor/mineral/plastitanium,
/area/ruin/unpowered/crashed_starwalker)
"bL" = (
Expand Down Expand Up @@ -942,7 +942,7 @@
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/closet/crate/secure/gear,
/obj/item/ammo_box/c10mm/surplus,
/obj/item/storage/box/ammo/c10mm_surplus,
/obj/item/weaponcrafting/stock,
/obj/item/weaponcrafting/stock{
pixel_x = -6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,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)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2745,7 +2745,7 @@
/area/ruin/rockplanet/nanotrasen)
"WY" = (
/obj/structure/frame/computer{
dir = 1;
dir = 1
},
/obj/effect/turf_decal/corner/opaque/red/diagonal,
/turf/open/floor/plasteel/tech/techmaint,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3086,7 +3086,7 @@
pixel_x = -3
},
/obj/item/ammo_box/magazine/illestren_a850r,
/obj/item/ammo_box/c9mm/ap,
/obj/item/storage/box/ammo/c9mm/ap,
/obj/item/ammo_box/magazine/illestren_a850r,
/obj/item/ammo_box/magazine/co9mm{
start_empty = 1
Expand Down
5 changes: 1 addition & 4 deletions _maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1862,10 +1862,7 @@
pixel_x = 5;
pixel_y = 7
},
/obj/item/ammo_box/foambox/riot{
pixel_x = -3;
pixel_y = -3
},
/obj/item/storage/box/ammo/foam_darts/riot,
/obj/structure/cable{
icon_state = "4-8"
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2002,7 +2002,7 @@
},
/obj/item/ammo_box/magazine/m9mm_rattlesnake,
/obj/item/ammo_box/magazine/m9mm_rattlesnake,
/obj/item/storage/pistolcase/ringneck,
/obj/item/gun/ballistic/automatic/pistol/rattlesnake/no_mag,
/turf/open/floor/plasteel/mono/dark,
/area/ruin/rockplanet/shippingdocksecure)
"rK" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1301,7 +1301,7 @@
"XP" = (
/obj/structure/table,
/obj/item/trash/can,
/obj/item/ammo_box/c45/surplus,
/obj/item/storage/box/ammo/c45_surplus,
/turf/open/floor/concrete,
/area/ruin)
"XS" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1447,7 +1447,7 @@
/obj/machinery/door/airlock/hatch{
welded = 1
},
/turf/template_noop,
/turf/open/floor/plating,
/area/ruin/whitesands/pubbycrash/split)
"ET" = (
/obj/structure/cable/yellow{
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/power_puzzle.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2694,8 +2694,8 @@
/obj/structure/closet/crate/secure/weapon{
name = "Ammo Crate"
},
/obj/item/ammo_box/c9mm/surplus,
/obj/item/ammo_box/c9mm/surplus,
/obj/item/storage/box/ammo/c9mm_surplus,
/obj/item/storage/box/ammo/c9mm_surplus,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
/turf/open/floor/plasteel,
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/spacemall.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
/obj/item/toy/talking/AI{
pixel_x = 20
},
/obj/item/ammo_box/foambox/riot,
/obj/item/storage/box/ammo/foam_darts/riot,
/obj/item/gun/ballistic/shotgun/toy,
/turf/open/floor/light,
/area/ruin/space/has_grav/spacemall/shop2)
Expand Down Expand Up @@ -2434,7 +2434,7 @@
/area/ruin/space/has_grav/spacemall)
"jm" = (
/obj/structure/rack,
/obj/item/ammo_box/c9mm,
/obj/item/storage/box/ammo/c9mm,
/obj/item/ammo_box/magazine/co9mm{
pixel_x = 5
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@
/area/ruin/powered)
"gw" = (
/obj/structure/table,
/obj/item/ammo_box/c45,
/obj/item/storage/box/ammo/c45,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/mono/white,
/area/ruin/powered)
"gx" = (
/obj/structure/table,
/obj/item/ammo_box/c9mm/rubbershot,
/obj/item/storage/box/ammo/c9mm_rubber,
/turf/open/floor/plasteel/mono/white,
/area/ruin/powered)
"gz" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/area/ruin/wasteplanet)
"bc" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/ammo_box/c9mm,
/obj/item/storage/box/ammo/c9mm,
/turf/open/floor/plating/wasteplanet,
/area/ruin/wasteplanet)
"bd" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/WasteRuins/wasteplanet_yard.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3042,10 +3042,10 @@
icon_state = "0-2"
},
/obj/structure/closet/wall/directional/west,
/obj/item/gun/ballistic/revolver,
/obj/item/clothing/suit/hooded/wintercoat/captain,
/obj/item/storage/firstaid/o2,
/obj/machinery/light/small/broken/directional/north,
/obj/item/gun/ballistic/revolver/viper/indie,
/turf/open/floor/plasteel/wasteplanet,
/area/ruin/wasteplanet/wasteplanet_shipbreaking/ship)
"Mf" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/independent/independent_dwayne.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,9 @@
dir = 9
},
/obj/effect/decal/cleanable/dirt,
/obj/item/ammo_box/c38_box,
/obj/item/ammo_box/c38_box,
/obj/item/ammo_box/c38_box,
/obj/item/storage/box/ammo/c38,
/obj/item/storage/box/ammo/c38,
/obj/item/storage/box/ammo/c38,
/obj/structure/closet/crate/secure/plasma{
name = "ammo crate";
desc = "A secure ammo crate."
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/independent/independent_kilo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
/obj/item/ammo_box/a12g/rubbershot,
/obj/item/storage/box/ammo/a12g_rubbershot,
/obj/item/gun/ballistic/shotgun/doublebarrel/presawn{
spawnwithmagazine = 0
},
Expand Down Expand Up @@ -1875,7 +1875,7 @@
icon_state = "9-10"
},
/obj/effect/decal/cleanable/oil,
/obj/item/ammo_box/a12g,
/obj/item/storage/box/ammo/a12g_buckshot,
/obj/item/gun/ballistic/shotgun/doublebarrel/no_mag,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_rigger.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4132,7 +4132,7 @@
name = "ammunition locker";
req_access_txt = "1"
},
/obj/item/ammo_box/c38_box,
/obj/item/storage/box/ammo/c38,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_shetland.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3475,7 +3475,7 @@
req_access_txt = "1";
req_ship_access = 1
},
/obj/item/ammo_box/c38_box,
/obj/item/storage/box/ammo/c38,
/obj/effect/turf_decal/box,
/obj/item/ammo_box/c38,
/obj/item/ammo_box/c38,
Expand Down
8 changes: 2 additions & 6 deletions _maps/shuttles/inteq/inteq_colossus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2224,9 +2224,7 @@
name = "folder"
},
/obj/item/pen/fourcolor,
/obj/item/stamp/hos{
name = "vanguard's rubber stamp"
},
/obj/item/stamp/inteq/vanguard,
/obj/item/reagent_containers/food/drinks/coffee{
pixel_y = 20
},
Expand Down Expand Up @@ -4212,9 +4210,7 @@
desc = "A slick black folder stamped 'Property of Inteq Risk Management Group.'";
name = "folder"
},
/obj/item/stamp/law{
name = "master at arms' rubber stamp"
},
/obj/item/stamp/inteq/maa,
/obj/item/table_bell{
pixel_y = 13
},
Expand Down
9 changes: 2 additions & 7 deletions _maps/shuttles/inteq/inteq_hound.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,7 @@
pixel_x = -11;
pixel_y = 5
},
/obj/item/ammo_box/a762_40/inteq{
pixel_x = 5;
pixel_y = 12
},
/obj/item/storage/box/ammo/a762_40/inteq,
/obj/item/reagent_containers/food/drinks/bottle/whiskey{
pixel_x = -7;
pixel_y = 6
Expand Down Expand Up @@ -2346,9 +2343,7 @@
/obj/item/gps{
pixel_x = 12
},
/obj/item/stamp/hos{
name = "vanguard's rubber stamp"
},
/obj/item/stamp/inteq/vanguard,
/obj/item/pen/fountain,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
Expand Down
Loading

0 comments on commit 81b86b4

Please sign in to comment.