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.

Sign up for GitHub

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

Jump to bottom

#15 Перенос обновлений с Beta на Alpha сервер #877

Merged
merged 31 commits into from
Aug 3, 2024
Merged

#15 Перенос обновлений с Beta на Alpha сервер #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
7458883
Refresh TGUI, OOC tab changes
Yata9ar4su Jul 23, 2024
211a5d2
readme, funneh
Yata9ar4su Jul 23, 2024
b09158a
readme fix...
Yata9ar4su Jul 23, 2024
5e6ba40
moth
Yata9ar4su Jul 23, 2024
16f10fb
PR issue fixes
Yata9ar4su Jul 23, 2024
c1e19e7
no moth
Yata9ar4su Jul 23, 2024
8c20e19
more fixes
Yata9ar4su Jul 23, 2024
8329f6c
fixfixifx
Yata9ar4su Jul 23, 2024
d15c130
reverts 'Increases the price of automatic weapons and some handguns' …
generalthrax Jul 23, 2024
1cacb9f
BG-16 fixes (#3230)
SomeguyManperson Jul 23, 2024
f5f3b9d
Mission Drills and Containers display what they need (#3211)
Gristlebee Jul 23, 2024
f41ff55
Changes the ingredients of two Gezenan drinks to better reflect their…
DIB-DOG Jul 23, 2024
097a620
Frontiersman Distillery Ruin (#2907)
goober3 Jul 23, 2024
7fbd03d
Adds a new ruin: the Abandoned Listening Post (#3103)
firebudgy Jul 25, 2024
601ac1a
Marker Beacons can be printed in the autolathe (#3224)
Gristlebee Jul 26, 2024
f80fa9c
requests manager, send fax в отдельную подвкладку по запросу Молнии
Yata9ar4su Jul 28, 2024
b4ef21e
rdme
Yata9ar4su Jul 28, 2024
36a00f4
merge conflict fix
Yata9ar4su Jul 28, 2024
ae060ac
Merge branch 'CeladonSS13:beta-dev' into tgui-refresh-button-nd-ooc-c…
Yata9arasu Jul 28, 2024
87ce750
readme update
Yata9ar4su Jul 28, 2024
66460c2
final commit...
Yata9ar4su Jul 28, 2024
769d772
Merge pull request #859 from Yata9arasu/tgui-refresh-button-nd-ooc-cl…
MysticalFaceLesS Jul 28, 2024
5c22f5d
Небольшая перебалансировка Пандоры и элиток
RalseiDreemuurr Jul 29, 2024
6193324
Merge pull request #871 from RalseiDreemuurr/codding
MrCat15352 Jul 29, 2024
df64c0b
Fix + Update: QoL
molnizz Jul 29, 2024
e403f73
Добавление масок и шлемов для морд сарати (#873)
RalseiDreemuurr Jul 31, 2024
c215190
Merge pull request #872 from molnizz/cringe18
MrCat15352 Jul 31, 2024
92879b8
Исправления ошибок спрайтов, книг и кривого кода
RalseiDreemuurr Aug 1, 2024
4c3c743
Merge pull request #874 from RalseiDreemuurr/sprites
MysticalFaceLesS Aug 1, 2024
76d42b7
Полировка кода для "носатых" шлемов и масок
RalseiDreemuurr Aug 2, 2024
1a54f44
Merge pull request #875 from RalseiDreemuurr/sprites
MysticalFaceLesS Aug 2, 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
3,947 changes: 3,947 additions & 0 deletions _maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
View file
Open in desktop

Large diffs are not rendered by default.

6,628 changes: 6,628 additions & 0 deletions _maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _maps/_mod_celadon/RandomRuins/SpaceRuins/corporate_mining.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@
/obj/item/clothing/suit/hazardvest/donk/qm,
/obj/item/reagent_containers/food/snacks/donkpocket,
/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/suppressor,
/obj/item/attachment/silencer,
/turf/open/floor/wood,
/area/ruin/space/has_grav/corporatemine/crewquarters)
"nW" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/independent/independent_byo.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
/area/ship/construction)
"jj" = (
/obj/structure/closet/crate/solarpanel_small,
/obj/item/circuitboard/computer/cargo,
/turf/open/floor/plating/airless,
/area/ship/construction)
"ke" = (
Expand Down Expand Up @@ -330,7 +331,6 @@
},
/obj/item/wallframe/intercom/wideband,
/obj/item/circuitboard/machine/holopad,
/obj/item/circuitboard/computer/cargo/express,
/obj/item/spacecash/bundle/loadsamoney,
/obj/item/spacecash/bundle/loadsamoney,
/obj/item/spacecash/bundle/loadsamoney,
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/independent/independent_junker.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
},
/obj/effect/decal/cleanable/glass,
/obj/structure/safe/floor,
/obj/item/circuitboard/computer/cargo/express,
/turf/open/floor/pod/dark,
/area/ship/crew/office)
"bJ" = (
Expand Down Expand Up @@ -667,6 +666,7 @@
/obj/machinery/atmospherics/pipe/simple/purple/hidden{
dir = 9
},
/obj/item/circuitboard/computer/cargo,
/turf/open/floor/pod/dark,
/area/ship/crew/office)
"lU" = (
Expand Down
Loading
Loading