Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#16 Перенос обновлений с Beta на Alpha сервер #888

Merged
merged 44 commits into from
Aug 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
6cf57cb
[MDB Ignore] Rkz's Newfood: Part 1 of 4 (#3148)
Tsar-Salat Jul 30, 2024
5b62181
HotFix
MysticalFaceLesS Aug 3, 2024
ddfc973
Remaps the Kilo (#3199)
Sadhorizon Aug 1, 2024
c940642
Legion attacks now kill you slower (#3141)
SomeguyManperson Aug 1, 2024
6b64244
distress signal admin button (#3186)
FalloutFalcon Aug 1, 2024
3d0cad2
Reduces prices of first aid kits. (#3221)
Sadhorizon Aug 1, 2024
4e61602
Coffee jitter nerf. (#3217)
Sadhorizon Aug 1, 2024
562309e
makes the industrial jacket warm (#3251)
generalthrax Aug 1, 2024
ed9fb0c
Attachments are now small instead of normal sized (#3257)
SomeguyManperson Aug 1, 2024
0ca4542
Cargo Typos (Contender) (#3259)
generalthrax Aug 1, 2024
48330a5
Additional sprites for Vox - Inteq and NGR (#3255)
firebudgy Aug 2, 2024
421d07f
Guncase fix 2 (#3241)
SomeguyManperson Aug 2, 2024
2b06d7b
Adds an anesthetics crate to cargo (#3254)
zimon9 Aug 2, 2024
93ec332
Fixed gun executions (#3253)
Anticept Aug 2, 2024
e3407bb
Fixed: wrong cash bundle value, cash dropping upon stacking (#3236)
Yata9ar4su Aug 2, 2024
b49b568
Makes 8x50 boxes have exactly 5 rounds more. (#3242)
Martinpachu Aug 2, 2024
a1d4dc3
Makes oxygen tanks at the outpost very cheap. (#3247)
Sadhorizon Aug 2, 2024
cbfe145
Muzzle Flash-ening! (#3267)
Imaginos16 Aug 3, 2024
45539b5
Combustion & Electrolyzer fixes (#3202)
Thera-Pissed Aug 3, 2024
fe2008e
Consistent Exosuit Terminology (#3195)
Apogee-dev Aug 3, 2024
6e6a148
Adds directionals for the mining processing console/electrolyzer cons…
Sadhorizon Aug 3, 2024
5c53200
Fixes three total typos in the code. (#3265)
firebudgy Aug 3, 2024
d8099d2
Buffs the LP hardsuits (#3263)
Latentish Aug 3, 2024
0420035
Removes Syndie survival boxes (#3229)
Apogee-dev Aug 3, 2024
14682a3
Legions drop less money (#3234)
FalloutFalcon Aug 3, 2024
1cf2178
Autolathable stripper clips and 7.62 polymer rifle. (#3240)
Martinpachu Aug 3, 2024
cf108d5
Sandbags can be bought at the outpost and deconstructed by click drag…
Gristlebee Aug 3, 2024
503d276
Social Anxiety quirk fixes and tweaks (#3222)
Zevotech Aug 3, 2024
df0e057
Update elysium_kondor.dmm
AnZerG86 Aug 4, 2024
2a5ec46
Update elysium_kondor.dmm
AnZerG86 Aug 4, 2024
5228380
Merge pull request #879 from AnZerG86/Fix-kondor-ship
molnizz Aug 4, 2024
f00d0d9
Elysm manual fix
Overteh Aug 8, 2024
81f5dc4
Merge pull request #881 from Overteh/Cringus20
MrCat15352 Aug 8, 2024
10ab18c
Battery problem (#880)
molnizz Aug 8, 2024
260236d
Fix after merge (maps) part 2
Overteh Aug 8, 2024
33e534e
Merge pull request #882 from Overteh/Cringus21
MysticalFaceLesS Aug 8, 2024
30f0b69
Fix after merge (maps) part 3 and Update independent_tranquility
MysticalFaceLesS Aug 8, 2024
7fe14e8
Merge pull request #883 from MysticalFaceLesS/beta-dev
MysticalFaceLesS Aug 8, 2024
d67b9fb
HotFix: Pandora minions
MysticalFaceLesS Aug 8, 2024
9aabdce
Merge pull request #884 from MysticalFaceLesS/beta-dev
MysticalFaceLesS Aug 8, 2024
87f252f
brings back hotkey fix
Yata9ar4su Aug 8, 2024
eea01a7
Revert "Battery problem (#880)"
molnizz Aug 9, 2024
9c9dcc5
Merge pull request #885 from Yata9arasu/hotkey-fix-return
MysticalFaceLesS Aug 9, 2024
a009fd6
Merge pull request #886 from CeladonSS13/revert-880-cringe19
MysticalFaceLesS Aug 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 @@ -606,7 +606,7 @@
/area/ruin/beach/complex)
"kK" = (
/obj/structure/closet/crate/bin,
/obj/item/reagent_containers/food/snacks/breadslice/moldy,
/obj/item/food/breadslice/moldy,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/concrete/slab_4,
/area/ruin/beach/complex)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
},
/obj/structure/table/wood/reinforced,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
/obj/item/food/breadslice/moldy{
pixel_x = 3;
pixel_y = 6
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/JungleRuins/jungle_paradise.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5381,7 +5381,7 @@
"Ih" = (
/obj/structure/table/wood,
/obj/machinery/light/directional/south,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
/obj/item/food/breadslice/moldy{
pixel_x = -8
},
/obj/item/reagent_containers/food/snacks/grown/berries/poison{
Expand Down Expand Up @@ -7509,7 +7509,7 @@
},
/obj/effect/mob_spawn/human/corpse/nanotrasensoldier,
/obj/effect/decal/cleanable/vomit/old,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
/obj/item/food/breadslice/moldy{
pixel_x = -4;
pixel_y = 16
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@
/obj/structure/cable/green{
icon_state = "1-4"
},
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
/obj/item/food/breadslice/moldy{
pixel_x = 5
},
/turf/open/floor/pod,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@
/area/ruin/unpowered/winter_biodome)
"kb" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/breadslice/plain,
/obj/item/food/breadslice/plain,
/obj/item/reagent_containers/food/snacks/grown/cabbage,
/turf/open/floor/wood,
/area/ruin/unpowered/winter_biodome/cabin)
Expand Down Expand Up @@ -1006,8 +1006,8 @@
"oR" = (
/obj/effect/turf_decal/corner/opaque/solgovblue/diagonal,
/obj/structure/closet/secure_closet/freezer,
/obj/item/reagent_containers/food/snacks/store/bread/plain,
/obj/item/reagent_containers/food/snacks/store/bread/plain,
/obj/item/food/bread/plain,
/obj/item/food/bread/plain,
/obj/item/reagent_containers/food/snacks/grown/cabbage,
/obj/item/reagent_containers/food/snacks/grown/cabbage,
/obj/effect/decal/cleanable/dirt/dust,
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 @@ -3431,7 +3431,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/secure_closet/freezer/wall/directional/east,
/obj/item/reagent_containers/food/snacks/chips,
/obj/item/reagent_containers/food/snacks/butterdog,
/obj/item/food/butterdog,
/obj/item/reagent_containers/food/snacks/chips{
pixel_x = 2
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
/turf/open/floor/plating,
/area/ruin)
"ii" = (
/obj/item/ammo_box/aac_300blk_stripper,
/obj/item/ammo_box/a762_stripper,
/turf/open/floor/wood,
/area/ruin)
"iK" = (
Expand Down Expand Up @@ -1184,8 +1184,8 @@
/area/ruin)
"Tl" = (
/obj/structure/table,
/obj/item/ammo_box/aac_300blk_stripper,
/obj/item/ammo_box/aac_300blk_stripper,
/obj/item/ammo_box/a762_stripper,
/obj/item/ammo_box/a762_stripper,
/turf/open/floor/concrete,
/area/ruin)
"TH" = (
Expand Down
8 changes: 1 addition & 7 deletions _maps/RandomRuins/SpaceRuins/onehalf.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2034,12 +2034,6 @@
},
/turf/open/space,
/area/space/nearstation)
"Ra" = (
/obj/structure/frame/computer{
dir = 8
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/onehalf)
"Rv" = (
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood/airless{
Expand Down Expand Up @@ -3328,7 +3322,7 @@ UM
cp
ZX
Gv
Ra
Gv
cU
YE
bU
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/power_puzzle.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1739,7 +1739,7 @@
/area/ruin/space/has_grav/powerpuzzle/secure)
"sc" = (
/obj/effect/mob_spawn/human/corpse/cargo_tech,
/obj/item/reagent_containers/food/snacks/cakeslice/birthday,
/obj/item/food/cakeslice/birthday,
/obj/effect/decal/cleanable/confetti,
/obj/machinery/light/small/broken/directional/east,
/obj/structure/toilet,
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 @@ -3606,7 +3606,7 @@
/area/ruin/space/has_grav/spacemall/shop)
"nS" = (
/obj/effect/turf_decal/corner/transparent/black/diagonal,
/obj/item/reagent_containers/food/snacks/store/bread/spidermeat,
/obj/item/food/bread/spidermeat,
/obj/structure/table,
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/spacemall/dorms)
Expand Down Expand Up @@ -6776,7 +6776,7 @@
dir = 8
},
/obj/item/trash/plate,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
/obj/item/food/breadslice/moldy{
pixel_y = 6
},
/obj/item/reagent_containers/food/snacks/spiderling{
Expand Down
10 changes: 5 additions & 5 deletions _maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1398,7 +1398,7 @@
dir = 4
},
/obj/machinery/door/airlock/engineering{
name = "Mech Lab";
name = "Exosuit Lab";
dir = 4
},
/obj/machinery/door/firedoor/border_only{
Expand Down Expand Up @@ -2577,7 +2577,7 @@
/area/ruin/wasteplanet/abandoned_mechbay/mechlab)
"DY" = (
/obj/machinery/door/airlock/engineering{
name = "Mech Lab";
name = "Exosuit Lab";
dir = 4
},
/obj/effect/decal/cleanable/glass,
Expand Down Expand Up @@ -2723,7 +2723,7 @@
},
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/human/syndicate/melee{
name = "Syndicate Mech Pilot"
name = "Syndicate Exosuit Pilot"
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ruin/wasteplanet/abandoned_mechbay/crewquarters)
Expand Down Expand Up @@ -2771,7 +2771,7 @@
"Hj" = (
/obj/machinery/light/dim/directional/south,
/mob/living/simple_animal/hostile/human/syndicate/melee{
name = "Syndicate Mech Pilot"
name = "Syndicate Exosuit Pilot"
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ruin/wasteplanet/abandoned_mechbay/bay2)
Expand Down Expand Up @@ -3016,7 +3016,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/directional/south,
/mob/living/simple_animal/hostile/human/syndicate/melee{
name = "Syndicate Mech Pilot"
name = "Syndicate Exosuit Pilot"
},
/turf/open/floor/plasteel/dark,
/area/ruin/wasteplanet/abandoned_mechbay/bay1)
Expand Down
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 Expand Up @@ -606,8 +606,8 @@
/area/ruin/beach/complex)
"kK" = (
/obj/structure/closet/crate/bin,
/obj/item/reagent_containers/food/snacks/breadslice/moldy,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/food/breadslice/moldy,
/turf/open/floor/concrete/slab_4,
/area/ruin/beach/complex)
"kM" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -835,9 +835,7 @@
icon_state = "1-4"
},
/obj/structure/spacevine/weak,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
pixel_x = 5
},
/obj/item/food/breadslice/moldy,
/turf/open/floor/pod,
/area/ruin/beach/oceantown/house{
name = "Starwalker"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,6 @@
},
/obj/structure/table/wood/reinforced,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
pixel_x = 3;
pixel_y = 6
},
/obj/item/storage/fancy/nugget_box{
pixel_y = 10;
pixel_x = -5
Expand All @@ -252,6 +248,7 @@
pixel_x = -8;
pixel_y = 3
},
/obj/item/food/breadslice/moldy,
/turf/open/floor/carpet/red,
/area/ruin/beach/treasure_cove)
"jf" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5381,13 +5381,11 @@
"Ih" = (
/obj/structure/table/wood,
/obj/machinery/light/directional/south,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
pixel_x = -8
},
/obj/item/reagent_containers/food/snacks/grown/berries/poison{
pixel_x = -6;
pixel_y = 6
},
/obj/item/food/breadslice/moldy,
/turf/open/floor/plating/dirt/jungle/dark,
/area/overmap_encounter/planetoid/cave/explored)
"Ik" = (
Expand Down Expand Up @@ -7509,14 +7507,11 @@
},
/obj/effect/mob_spawn/human/corpse/nanotrasensoldier,
/obj/effect/decal/cleanable/vomit/old,
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
pixel_x = -4;
pixel_y = 16
},
/obj/item/reagent_containers/food/snacks/grown/berries/poison{
pixel_x = 2;
pixel_y = 19
},
/obj/item/food/breadslice/moldy,
/turf/open/floor/plating/dirt/jungle/dark,
/area/overmap_encounter/planetoid/cave/explored)
"WD" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -721,9 +721,7 @@
/obj/structure/cable/green{
icon_state = "1-4"
},
/obj/item/reagent_containers/food/snacks/breadslice/moldy{
pixel_x = 5
},
/obj/item/food/breadslice/moldy,
/turf/open/floor/pod,
/area/ruin/unpowered/crashed_starwalker)
"lq" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -829,8 +829,8 @@
/area/ruin/unpowered/winter_biodome)
"kb" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/breadslice/plain,
/obj/item/reagent_containers/food/snacks/grown/cabbage,
/obj/item/food/breadslice/plain,
/turf/open/floor/wood,
/area/ruin/unpowered/winter_biodome/cabin)
"kj" = (
Expand Down Expand Up @@ -1006,11 +1006,11 @@
"oR" = (
/obj/effect/turf_decal/corner/opaque/solgovblue/diagonal,
/obj/structure/closet/secure_closet/freezer,
/obj/item/reagent_containers/food/snacks/store/bread/plain,
/obj/item/reagent_containers/food/snacks/store/bread/plain,
/obj/item/reagent_containers/food/snacks/grown/cabbage,
/obj/item/reagent_containers/food/snacks/grown/cabbage,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/food/bread/plain,
/obj/item/food/bread/plain,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/winter_biodome/living_quarters)
"ph" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
/area/ruin/unpowered)
"F" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/store/cake/birthday,
/obj/item/food/cake/birthday,
/turf/open/floor/wood{
initial_gas_mix = "o2=14;n2=5;co2=13;TEMP=300"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
/turf/open/floor/plating,
/area/ruin)
"ii" = (
/obj/item/ammo_box/aac_300blk_stripper,
/obj/item/ammo_box/a762_stripper,
/turf/open/floor/wood,
/area/ruin)
"iK" = (
Expand Down Expand Up @@ -1184,8 +1184,8 @@
/area/ruin)
"Tl" = (
/obj/structure/table,
/obj/item/ammo_box/aac_300blk_stripper,
/obj/item/ammo_box/aac_300blk_stripper,
/obj/item/ammo_box/a762_stripper,
/obj/item/ammo_box/a762_stripper,
/turf/open/floor/concrete,
/area/ruin)
"TH" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
"f" = (
/obj/structure/rack,
/obj/item/reagent_containers/food/snacks/cornchips,
/obj/item/reagent_containers/food/snacks/butterdog,
/obj/item/reagent_containers/food/snacks/candy,
/obj/item/reagent_containers/food/snacks/canned/peaches,
/obj/item/reagent_containers/food/drinks/bottle/sarsaparilla,
/obj/item/food/butterdog,
/turf/open/floor/wood,
/area/ruin/unpowered)
"g" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
/area/ruin/powered)
"lN" = (
/obj/structure/table/wood/fancy,
/obj/item/reagent_containers/food/snacks/cakeslice/lime,
/obj/item/food/cakeslice/lime,
/turf/open/floor/carpet,
/area/ruin/powered)
"lQ" = (
Expand Down Expand Up @@ -663,7 +663,7 @@
/area/ruin/powered)
"qv" = (
/obj/structure/table/wood/fancy,
/obj/item/reagent_containers/food/snacks/cakeslice/chocolate,
/obj/item/food/cakeslice/chocolate,
/turf/open/floor/carpet,
/area/ruin/powered)
"qC" = (
Expand Down Expand Up @@ -1064,7 +1064,7 @@
/area/ruin/powered)
"Aj" = (
/obj/structure/table/wood/fancy,
/obj/item/reagent_containers/food/snacks/cakeslice/cheese,
/obj/item/food/cakeslice/cheese,
/turf/open/floor/carpet,
/area/ruin/powered)
"AC" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1739,13 +1739,13 @@
/area/ruin/space/has_grav/powerpuzzle/secure)
"sc" = (
/obj/effect/mob_spawn/human/corpse/cargo_tech,
/obj/item/reagent_containers/food/snacks/cakeslice/birthday,
/obj/effect/decal/cleanable/confetti,
/obj/machinery/light/small/broken/directional/east,
/obj/structure/toilet,
/obj/machinery/shower{
dir = 4
},
/obj/item/food/cakeslice/birthday,
/turf/open/floor/plasteel/showroomfloor{
name = "bathroom floor"
},
Expand Down
Loading
Loading