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

#4 Перенос обновлений с Beta на Alpha сервер #524

Merged
merged 75 commits into from
May 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
060bf4b
NT Sprite Overhaul (#2881)
thgvr May 1, 2024
4a5fd96
Adds missing descs to Nanotrasen uniform items (#2951)
Apogee-dev May 3, 2024
3993d6b
Fix After Megre
molnizz May 4, 2024
5c4dbf6
Новый корабль и мелкие фиксы прошлых (#485)
Overteh May 4, 2024
04ad51d
Fix after fix
molnizz May 4, 2024
79755dc
Merge pull request #486 from molnizz/cringe5
MysticalFaceLesS May 4, 2024
0bf6db4
Use default return in honk emote
SuhEugene May 4, 2024
ffd531d
Merge pull request #487 from SuhEugene/fix-by-using-return
MrCat15352 May 4, 2024
816fd81
added main code
Yata9ar4su May 4, 2024
68151b4
changed readme
Yata9ar4su May 4, 2024
7a87e84
added pr link in readme
Yata9ar4su May 4, 2024
3f6594f
readmefix again
Yata9ar4su May 4, 2024
228060c
Readme fix again
Yata9ar4su May 4, 2024
e2678fe
Update README.md
Yata9arasu May 4, 2024
6d7e2fd
Небольшой ремапп
VastKilleroOm May 5, 2024
7799a18
Hide invisimin users from HUDs and Ghosts (#2922)
SuhEugene May 5, 2024
1907395
Adjusted Pure Soulus Dust (#2935)
Anticept May 5, 2024
925341b
Match bullets no longer have a highly above-average chance to ricoche…
SomeguyManperson May 5, 2024
a42e2ae
Adds the Candor to Cargo. (#2946)
Martinpachu May 5, 2024
8557521
Makes the .38 revolver smaller and less expensive. (#2947)
Martinpachu May 5, 2024
023902e
Removes reality integrity issues from EXOCOM (#2938)
Sun-Soaked May 5, 2024
44ed4bf
Add default return for robotic emotes (#2955)
SuhEugene May 5, 2024
d8defc4
Intercomms, widebands, and headets defaults to on again. Handhelds co…
Anticept May 5, 2024
eaf6f45
Configs fix
molnizz May 5, 2024
26ec0ac
Merge pull request #488 from VastKilleroOm/beta-dev
molnizz May 5, 2024
919fee2
Merge pull request #489 from molnizz/cringe5
MysticalFaceLesS May 5, 2024
fcd4eb5
FaF and new pirate ship
molnizz May 5, 2024
6b935d7
Merge pull request #490 from molnizz/cringe5
MysticalFaceLesS May 5, 2024
e1f7585
Tweak: Universal vendor circuit now can be used in Mining vendor (#482)
Yata9arasu May 6, 2024
9ffaf7f
Remap Talos-Class | Celadon. "Finnaly" (#491)
Burbonchik May 6, 2024
7bc5b43
Hound fix console and "Crying sun" rebalance (#493)
molnizz May 7, 2024
3c1a823
Портированы мехи с 514 билда
MrCat15352 May 8, 2024
b5c512b
Add: new pets (#498)
MrCat15352 May 8, 2024
efb9caf
Merge pull request #497 from MrCat15352/port_mech
MrCat15352 May 8, 2024
e413288
Добавление модульности всем картам
MrCat15352 May 8, 2024
2b55ee7
Merge pull request #500 from MrCat15352/maps-to-mod_celadon
MrCat15352 May 8, 2024
30d0588
Update inteq_talos.dmm (#499)
Chituka May 8, 2024
05e02c6
Give elysim bongs
molnizz May 8, 2024
7807b03
FFF
molnizz May 9, 2024
29250d7
FFF2
molnizz May 9, 2024
99fa1c9
Фикс одинаковых префиксов
MrCat15352 May 9, 2024
a4e14cc
Merge pull request #502 from MrCat15352/maps-to-mod_celadon
MrCat15352 May 9, 2024
c55315f
Merge pull request #501 from molnizz/cringe8
MrCat15352 May 9, 2024
89e374f
Фикс смены аванпастов
MrCat15352 May 9, 2024
5ca34df
Merge branch 'maps-to-mod_celadon' of https://github.com/MrCat15352/M…
MrCat15352 May 9, 2024
481dac1
Merge pull request #503 from MrCat15352/maps-to-mod_celadon
MrCat15352 May 9, 2024
c130a29
Меняем траст и топливо движкам
MrCat15352 May 9, 2024
5f35d4b
Merge pull request #505 from MrCat15352/Revorks_engines
MrCat15352 May 9, 2024
33b4d7a
Вводим новые значения на тест
MrCat15352 May 9, 2024
bd5adc4
Merge pull request #506 from MrCat15352/Revorks_engines
MrCat15352 May 9, 2024
249526a
New Ship - Krait + minor fixes (#508)
RonninNiko May 9, 2024
9bc2af1
Resprite camers (#494)
MrCat15352 May 10, 2024
eae1809
Символика на обшивку кораблей и мелкие фиксы
Overteh May 10, 2024
b29d43e
Merge pull request #511 from Overteh/Cringus5
molnizz May 10, 2024
01c2b84
Фикс и мини-ремаппинг Хаммерхэда (#509)
RalseiDreemuurr May 10, 2024
b4f419c
Снижение цены на ИРП (#510)
MrCat15352 May 10, 2024
f6e4f2f
Добавлена Ириска (#495)
MrCat15352 May 10, 2024
41c19f6
Fix .308 caliber ammo (#514)
Mirag1993 May 10, 2024
918c2ed
3 реворк, чисто офы, поехали
MrCat15352 May 10, 2024
b2d2958
Merge pull request #515 from MrCat15352/Revorks_engines
MrCat15352 May 10, 2024
60fff2b
Томагавк больше не наваливает боком (#512)
Overteh May 10, 2024
7931b53
No more rotate junker
molnizz May 10, 2024
5f314d1
No more crux
molnizz May 10, 2024
8e1315d
Return Crux
molnizz May 10, 2024
07b1c98
Merge pull request #517 from molnizz/cringe8
MysticalFaceLesS May 11, 2024
4fddd8a
Cutting out the NT symbols
molnizz May 11, 2024
44324b5
Merge pull request #521 from molnizz/cringe8
MrCat15352 May 11, 2024
6f83e8e
Add: FOV, new costumes, black dec fedora (#520)
MrCat15352 May 11, 2024
4823624
Resprite: Cowboy boots (#518)
Yata9arasu May 11, 2024
ce79b28
Tweak: Wideband now 6 tiles loud (#519)
Yata9arasu May 11, 2024
eca3aed
Возвращаем обратно значения
MrCat15352 May 11, 2024
771ec2f
Merge pull request #522 from MrCat15352/Revorks_engines
MysticalFaceLesS May 11, 2024
cec3d06
Krait final (#523)
RonninNiko May 11, 2024
9ca3819
Merge branch 'alpha-stable' into beta-dev
MysticalFaceLesS May 11, 2024
6cec8ae
Revert "Merge branch 'alpha-stable' into beta-dev"
MysticalFaceLesS May 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9,097 changes: 9,097 additions & 0 deletions _maps/_mod_celadon/RandomRuins/BeachRuins/beach_ancient_ruin.dmm

Large diffs are not rendered by default.

1,545 changes: 1,545 additions & 0 deletions _maps/_mod_celadon/RandomRuins/BeachRuins/beach_colony.dmm

Large diffs are not rendered by default.

2,376 changes: 2,376 additions & 0 deletions _maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_engineer.dmm

Large diffs are not rendered by default.

5,391 changes: 5,391 additions & 0 deletions _maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm

Large diffs are not rendered by default.

2,606 changes: 2,606 additions & 0 deletions _maps/_mod_celadon/RandomRuins/BeachRuins/beach_fishing_hut.dmm

Large diffs are not rendered by default.

4,058 changes: 4,058 additions & 0 deletions _maps/_mod_celadon/RandomRuins/BeachRuins/beach_float_resort.dmm

Large diffs are not rendered by default.

3,347 changes: 3,347 additions & 0 deletions _maps/_mod_celadon/RandomRuins/BeachRuins/beach_knights_rest.dmm

Large diffs are not rendered by default.

10,462 changes: 10,462 additions & 0 deletions _maps/_mod_celadon/RandomRuins/BeachRuins/beach_ocean_town.dmm

Large diffs are not rendered by default.

2,543 changes: 2,543 additions & 0 deletions _maps/_mod_celadon/RandomRuins/BeachRuins/beach_pirate_crash.dmm

Large diffs are not rendered by default.

3,198 changes: 3,198 additions & 0 deletions _maps/_mod_celadon/RandomRuins/BeachRuins/beach_treasure_cove.dmm

Large diffs are not rendered by default.

4,725 changes: 4,725 additions & 0 deletions _maps/_mod_celadon/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm

Large diffs are not rendered by default.

3,427 changes: 3,427 additions & 0 deletions _maps/_mod_celadon/RandomRuins/IceRuins/icemoon_hydroponics_lab.dmm

Large diffs are not rendered by default.

3,668 changes: 3,668 additions & 0 deletions _maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm

Large diffs are not rendered by default.

2,727 changes: 2,727 additions & 0 deletions _maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2,538 changes: 2,538 additions & 0 deletions _maps/_mod_celadon/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm

Large diffs are not rendered by default.

1,587 changes: 1,587 additions & 0 deletions _maps/_mod_celadon/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm

Large diffs are not rendered by default.

4,739 changes: 4,739 additions & 0 deletions _maps/_mod_celadon/RandomRuins/JungleRuins/jungle_abandoned_library.dmm

Large diffs are not rendered by default.

15,374 changes: 15,374 additions & 0 deletions _maps/_mod_celadon/RandomRuins/JungleRuins/jungle_bombed_starport.dmm

Large diffs are not rendered by default.

1,013 changes: 1,013 additions & 0 deletions _maps/_mod_celadon/RandomRuins/JungleRuins/jungle_botany.dmm

Large diffs are not rendered by default.

7,107 changes: 7,107 additions & 0 deletions _maps/_mod_celadon/RandomRuins/JungleRuins/jungle_cavecrew.dmm

Large diffs are not rendered by default.

9,092 changes: 9,092 additions & 0 deletions _maps/_mod_celadon/RandomRuins/JungleRuins/jungle_interceptor.dmm

Large diffs are not rendered by default.

4,304 changes: 4,304 additions & 0 deletions _maps/_mod_celadon/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm

Large diffs are not rendered by default.

814 changes: 814 additions & 0 deletions _maps/_mod_celadon/RandomRuins/JungleRuins/jungle_nest.dmm

Large diffs are not rendered by default.

12,825 changes: 12,825 additions & 0 deletions _maps/_mod_celadon/RandomRuins/JungleRuins/jungle_paradise.dmm

Large diffs are not rendered by default.

747 changes: 747 additions & 0 deletions _maps/_mod_celadon/RandomRuins/JungleRuins/jungle_pirate.dmm

Large diffs are not rendered by default.

452 changes: 452 additions & 0 deletions _maps/_mod_celadon/RandomRuins/JungleRuins/jungle_pizzawave.dmm

Large diffs are not rendered by default.

462 changes: 462 additions & 0 deletions _maps/_mod_celadon/RandomRuins/JungleRuins/jungle_seedling.dmm

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,277 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"b" = (
/obj/structure/table/wood,
/obj/item/borg/upgrade/ai,
/turf/open/floor/wood,
/area/ruin/powered)
"e" = (
/obj/structure/table/wood,
/obj/item/mmi/posibrain,
/obj/item/mmi/posibrain,
/turf/open/floor/wood,
/area/ruin/powered)
"f" = (
/obj/structure/table/wood,
/obj/item/circuitboard/computer/borgupload,
/obj/item/circuitboard/computer/aiupload,
/turf/open/floor/wood,
/area/ruin/powered)
"g" = (
/obj/structure/table/wood,
/obj/item/borg/upgrade/transform/clown{
desc = "Allows you to to turn a cyborg into a... something.";
name = "borg module picker (Unknown)"
},
/obj/item/borg/upgrade/transform{
desc = "Allows you to to turn a cyborg into a... something.";
name = "borg module picker (Unknown)";
new_module = /obj/item/robot_module/syndicate_medical
},
/turf/open/floor/wood,
/area/ruin/powered)
"h" = (
/obj/machinery/door/airlock/wood{
dir = 4
},
/turf/open/floor/wood,
/area/ruin/powered)
"k" = (
/turf/open/floor/wood,
/area/ruin/powered)
"n" = (
/obj/effect/decal/remains/robot,
/turf/open/floor/wood,
/area/ruin/powered)
"p" = (
/obj/machinery/recharge_station,
/turf/open/floor/wood,
/area/ruin/powered)
"q" = (
/obj/item/bodypart/head/robot,
/turf/open/floor/wood,
/area/ruin/powered)
"r" = (
/obj/structure/table/wood,
/obj/item/aiModule/core/full/damaged{
name = "Unknown AI Core Module"
},
/obj/item/aiModule/core/full/hulkamania{
name = "Unknown AI Core Module"
},
/obj/item/aiModule/reset/purge,
/obj/item/aiModule/core/full/paladin_devotion{
name = "Unknown AI Core Module"
},
/obj/item/aiModule/reset,
/obj/item/aiModule/core/full/tyrant{
name = "Unknown AI Core Module"
},
/obj/item/aiModule/core/full/maintain{
name = "Unknown AI Core Module"
},
/obj/item/aiModule/core/full/reporter{
name = "Unknown AI Core Module"
},
/obj/item/aiModule/core/full/cybersun{
name = "Unknown AI Core Module"
},
/obj/item/aiModule/core/full/corp{
name = "Unknown AI Core Module"
},
/obj/item/aiModule/core/full/asimov{
name = "Unknown AI Core Module"
},
/turf/open/floor/wood,
/area/ruin/powered)
"u" = (
/obj/item/stock_parts/cell/hyper,
/turf/open/floor/wood,
/area/ruin/powered)
"w" = (
/obj/item/wallframe/camera,
/turf/open/floor/wood,
/area/ruin/powered)
"x" = (
/obj/item/stack/cable_coil,
/turf/open/floor/wood,
/area/ruin/powered)
"y" = (
/obj/structure/table/wood,
/obj/item/circuitboard/machine/cyborgrecharger,
/turf/open/floor/wood,
/area/ruin/powered)
"z" = (
/turf/closed/wall/mineral/wood/nonmetal,
/area/ruin/powered)
"D" = (
/obj/item/assembly/flash/handheld,
/turf/open/floor/wood,
/area/ruin/powered)
"F" = (
/obj/item/robot_suit/prebuilt,
/turf/open/floor/wood,
/area/ruin/powered)
"G" = (
/obj/item/assembly/flash/handheld,
/obj/item/stock_parts/cell/hyper,
/turf/open/floor/wood,
/area/ruin/powered)
"H" = (
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
/turf/open/floor/wood,
/area/ruin/powered)
"J" = (
/obj/structure/AIcore/latejoin_inactive,
/turf/open/floor/wood,
/area/ruin/powered)
"L" = (
/obj/item/bodypart/leg/right/robot,
/turf/open/floor/wood,
/area/ruin/powered)
"M" = (
/obj/item/bodypart/chest/robot,
/obj/item/wallframe/camera,
/turf/open/floor/wood,
/area/ruin/powered)
"N" = (
/obj/item/robot_suit,
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
/turf/open/floor/wood,
/area/ruin/powered)
"Q" = (
/obj/item/paper{
default_raw_text = "Welcome to your Space Ikea Brand Full AI Kit! There are all the amenities needed to create a functional AI for your installation in this easy to use kit! Note: Warranty void if exposed to: High Humidity, High Temperatures, Grass, Mud, The Jungle. Thank you for shopping Space Ikea!"
},
/turf/open/floor/wood,
/area/ruin/powered)
"R" = (
/obj/item/bodypart/l_arm/robot,
/turf/open/floor/wood,
/area/ruin/powered)
"S" = (
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
/turf/open/floor/wood,
/area/ruin/powered)
"U" = (
/turf/template_noop,
/area/template_noop)
"V" = (
/obj/item/aiModule/core/freeformcore,
/obj/item/stack/cable_coil,
/turf/open/floor/wood,
/area/ruin/powered)
"Y" = (
/obj/item/bodypart/r_arm/robot,
/turf/open/floor/wood,
/area/ruin/powered)
"Z" = (
/obj/item/bodypart/leg/left/robot,
/turf/open/floor/wood,
/area/ruin/powered)

(1,1,1) = {"
U
z
h
h
h
z
U
"}
(2,1,1) = {"
U
z
k
w
Q
z
U
"}
(3,1,1) = {"
U
z
n
G
R
z
U
"}
(4,1,1) = {"
z
z
p
H
D
z
z
"}
(5,1,1) = {"
z
e
q
w
S
r
z
"}
(6,1,1) = {"
z
f
u
J
V
y
z
"}
(7,1,1) = {"
z
g
w
L
n
b
z
"}
(8,1,1) = {"
z
z
x
M
D
z
z
"}
(9,1,1) = {"
U
z
D
N
Y
z
U
"}
(10,1,1) = {"
U
z
F
x
Z
z
U
"}
(11,1,1) = {"
U
z
z
z
z
z
U
"}
Loading