From 4ac5e6035365a60ed8044cc5776eea2b4bc1e063 Mon Sep 17 00:00:00 2001
From: Molnia <161384279+molnizz@users.noreply.github.com>
Date: Mon, 21 Oct 2024 00:41:04 +0500
Subject: [PATCH 1/4] Fix: Turfs Shepherd (#1121)
---
.../independent/independent_shepherd.dmm | 31 ++++++++++---------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_shepherd.dmm b/_maps/_mod_celadon/shuttles/independent/independent_shepherd.dmm
index 89204276cb3d..9ae4766dd22b 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_shepherd.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_shepherd.dmm
@@ -2387,10 +2387,6 @@
/turf/open/floor/carpet/red,
/area/ship/crew/library)
"vx" = (
-/obj/structure/chair/sofa{
- dir = 2;
- icon_state = "sofacorner"
- },
/obj/effect/turf_decal/siding/wood{
color = "#332521";
dir = 5
@@ -2403,6 +2399,7 @@
/obj/structure/cable{
icon_state = "0-2"
},
+/obj/structure/chair/sofa/grey/left,
/turf/open/floor/carpet/black,
/area/ship/crew/dorm/dormtwo)
"vF" = (
@@ -2778,6 +2775,11 @@
},
/turf/open/floor/wood,
/area/ship/hallway/starboard)
+"ze" = (
+/turf/open/floor/plasteel/stairs/mid{
+ dir = 1
+ },
+/area/ship/crew/hydroponics)
"zt" = (
/obj/structure/table/wood,
/obj/item/storage/firstaid/regular,
@@ -4560,10 +4562,6 @@
/turf/open/floor/grass/ship/jungle,
/area/ship/crew/hydroponics)
"PD" = (
-/obj/structure/chair/sofa{
- dir = 4;
- icon_state = "sofacorner"
- },
/obj/effect/turf_decal/siding/wood{
color = "#332521";
dir = 9
@@ -4571,6 +4569,9 @@
/obj/item/toy/plush/snakeplushie{
layer = 3.1
},
+/obj/structure/chair/sofa/grey/corner{
+ dir = 4
+ },
/turf/open/floor/carpet/black,
/area/ship/crew/dorm/dormtwo)
"PE" = (
@@ -5466,10 +5467,6 @@
/turf/open/floor/grass/fairy,
/area/ship/crew/hydroponics)
"VX" = (
-/obj/structure/chair/sofa{
- dir = 4;
- icon_state = "sofaend_right"
- },
/obj/effect/turf_decal/siding/wood{
color = "#332521";
dir = 10
@@ -5479,6 +5476,9 @@
pixel_y = 3;
layer = 3.1
},
+/obj/structure/chair/sofa/grey/right{
+ dir = 8
+ },
/turf/open/floor/carpet/black,
/area/ship/crew/dorm/dormtwo)
"Wf" = (
@@ -5491,7 +5491,6 @@
/turf/open/floor/plating/airless,
/area/ship/engineering/atmospherics)
"Wg" = (
-/obj/structure/chair/sofa,
/obj/effect/turf_decal/siding/wood{
color = "#332521";
dir = 1
@@ -5500,6 +5499,7 @@
pixel_y = 3;
layer = 3.1
},
+/obj/structure/chair/sofa/grey/directional,
/turf/open/floor/carpet/black,
/area/ship/crew/dorm/dormtwo)
"Wl" = (
@@ -5596,6 +5596,9 @@
/turf/open/floor/grass/ship/jungle,
/area/ship/crew/hydroponics)
"WJ" = (
+/turf/open/floor/plasteel/stairs/mid{
+ dir = 4
+ },
/area/ship/crew/hydroponics)
"Xd" = (
/obj/effect/turf_decal/siding/wood,
@@ -6746,7 +6749,7 @@ OS
Tl
yn
Tl
-WJ
+ze
Rg
sL
mB
From f61c7c56cf91e3ad3d3fe896fa25f4504de4a2af Mon Sep 17 00:00:00 2001
From: Discozavisim <107996502+Discozavisim@users.noreply.github.com>
Date: Sun, 20 Oct 2024 21:49:18 +0200
Subject: [PATCH 2/4] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=80=D0=B0?=
=?UTF-8?q?=D0=B7=D1=8A=D1=91=D0=B1=D0=B0=20=D1=81=D0=B0=D0=B1=D1=88=D0=B0?=
=?UTF-8?q?=D1=82=D1=82=D0=BB=D0=BE=D0=B2=20(#1111)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Update _overmap_datum.dm
* Update _overmap_datum.dm
* попробуем
* Update overmap_stuff.dm
* Update overmap_stuff.dm
* менты
* ну вроде ок
* упс
* уменьшаем меньше, по идее ок?
---
code/controllers/subsystem/overmap_move.dm | 10 ++++---
code/controllers/subsystem/overmap_stuff.dm | 31 +++++++++++----------
code/modules/overmap/_overmap_datum.dm | 4 +++
code/modules/overmap/overmap_token.dm | 4 +--
code/modules/overmap/ships/ship_datum.dm | 5 ++++
5 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/code/controllers/subsystem/overmap_move.dm b/code/controllers/subsystem/overmap_move.dm
index a3c50822ee08..d517b6935874 100644
--- a/code/controllers/subsystem/overmap_move.dm
+++ b/code/controllers/subsystem/overmap_move.dm
@@ -74,16 +74,18 @@ TIMER_SUBSYSTEM_DEF(overmap_movement)
var/obj/machinery/computer/helm/a = A.helms[arpdequeue_pointer]
a.say("Collision impact with vessel \"[B.name]\".")
playsound(a, 'sound/machines/engine_alert2.ogg', 50, FALSE)
- var/opposite_x = sin(SIMPLIFY_DEGREES(bearing+180))*(B.shuttle_port.turf_count/A.shuttle_port.turf_count)*max(0.002, max(B.speed_x, -B.speed_x))
- var/opposite_y = cos(SIMPLIFY_DEGREES(bearing+180))*(B.shuttle_port.turf_count/A.shuttle_port.turf_count)*max(0.002, max(B.speed_y, -B.speed_y))
+ var/opposite_x = sin(SIMPLIFY_DEGREES(bearing+180))*(B.shuttle_port.turf_count/A.shuttle_port.turf_count)*max(0.002, abs(B.speed_x))
+ var/opposite_y = cos(SIMPLIFY_DEGREES(bearing+180))*(B.shuttle_port.turf_count/A.shuttle_port.turf_count)*max(0.002, abs(B.speed_y))
+ var/alt_opposite_x = sin(SIMPLIFY_DEGREES(bearing))*(B.shuttle_port.turf_count/A.shuttle_port.turf_count)*max(0.002, abs(B.speed_x))
+ var/alt_opposite_y = cos(SIMPLIFY_DEGREES(bearing))*(B.shuttle_port.turf_count/A.shuttle_port.turf_count)*max(0.002, abs(B.speed_y))
if(!(A.datum_flags & DF_ISPROCESSING))
A.adjust_speed(-A.speed_x/2 + opposite_x, -A.speed_y/2 + opposite_y)
else
A.vector_to_add = list("x" = -A.speed_x/2 + opposite_x, "y" = -A.speed_y/2 + opposite_y)
if(!(B.datum_flags & DF_ISPROCESSING))
- B.adjust_speed(-B.speed_x/2 + opposite_x, -B.speed_y/2 + opposite_y)
+ B.adjust_speed(-B.speed_x/2 + alt_opposite_x, -B.speed_y/2 + alt_opposite_y)
else
- B.vector_to_add = list("x" = -B.speed_x/2 + -opposite_x, "y" = -B.speed_y/2 + -opposite_y)
+ B.vector_to_add = list("x" = -B.speed_x/2 + alt_opposite_x, "y" = -B.speed_y/2 + alt_opposite_y)
spawn_meteors_alt(round(60 SECONDS * MAGNITUDE(relative_motion_x, relative_motion_y))+1, list(/obj/effect/meteor/invisible), A.shuttle_port.get_virtual_level(), angle2dir_cardinal(SIMPLIFY_DEGREES((bearing-A.bow_heading+90))))
spawn_meteors_alt(round(60 SECONDS * MAGNITUDE(relative_motion_x, relative_motion_y))+1, list(/obj/effect/meteor/invisible), B.shuttle_port.get_virtual_level(), angle2dir_cardinal(SIMPLIFY_DEGREES((bearing-A.bow_heading+270))))
diff --git a/code/controllers/subsystem/overmap_stuff.dm b/code/controllers/subsystem/overmap_stuff.dm
index 0657869e8780..baea59c12ff6 100644
--- a/code/controllers/subsystem/overmap_stuff.dm
+++ b/code/controllers/subsystem/overmap_stuff.dm
@@ -50,14 +50,10 @@ SUBSYSTEM_DEF(overmap_stuff)
animate(i.token, pixel_w = smooth_anim["x"], pixel_z = smooth_anim["y"], wait, 1)
if(i.token.ship_image)
- if(i.token.ship_image.loc != i.token.loc)
- i.token.ship_image.forceMove(i.token.loc)
i.token.ship_image.pixel_w = i.last_anim["x"]
i.token.ship_image.pixel_z = i.last_anim["y"]
animate(i.token.ship_image, pixel_w = smooth_anim["x"], pixel_z = smooth_anim["y"], wait, 1)
if(i.token.move_vec)
- if(i.token.move_vec.loc != i.token.loc)
- i.token.move_vec.forceMove(i.token.loc)
i.token.move_vec.pixel_w = i.last_anim["x"]
i.token.move_vec.pixel_z = i.last_anim["y"]
animate(i.token.move_vec, pixel_w = smooth_anim["x"], pixel_z = smooth_anim["y"], wait, 1)
@@ -93,11 +89,6 @@ SUBSYSTEM_DEF(overmap_rotation_velocity)
controlled_ships = SSovermap.controlled_ships
for(var/datum/overmap/ship/i in controlled_ships)
if(!i.docked_to)
- if(i.token)
- if(i.token.ship_image)
- i.token.ship_image.alpha = 255
- if(i.token.move_vec)
- i.token.move_vec.alpha = 255
if(i.rotating == 1)
i.bow_heading = SIMPLIFY_DEGREES(i.bow_heading+i.rotation_velocity)
i.rotation_velocity = min(90, i.rotation_velocity+1)
@@ -109,11 +100,21 @@ SUBSYSTEM_DEF(overmap_rotation_velocity)
N.Turn(i.bow_heading)
if(i.token.ship_image)
i.token.ship_image.transform = N
- else
- if(i.token)
- if(i.token.ship_image)
- i.token.ship_image.alpha = 0
- if(i.token.move_vec)
- i.token.move_vec.alpha = 0
+
+/datum/overmap/ship/complete_dock(datum/overmap/dock_target, datum/docking_ticket/ticket)
+ if(token)
+ if(token.ship_image)
+ token.ship_image.forceMove(token)
+ if(token.move_vec)
+ token.move_vec.forceMove(token)
+ . = ..()
+
+/datum/overmap/ship/complete_undock()
+ if(token)
+ if(token.ship_image)
+ token.ship_image.forceMove(get_turf(docked_to.token))
+ if(token.move_vec)
+ token.move_vec.forceMove(get_turf(docked_to.token))
+ . = ..()
// [/CELADON-ADD]
diff --git a/code/modules/overmap/_overmap_datum.dm b/code/modules/overmap/_overmap_datum.dm
index db7248673a6d..3c3e22e85ab3 100644
--- a/code/modules/overmap/_overmap_datum.dm
+++ b/code/modules/overmap/_overmap_datum.dm
@@ -372,6 +372,10 @@
while(container && !container.x || !container.y)
container = container.docked_to
SSovermap.overmap_container[container.x][container.y] += src
+ //[CELADON-ADD] - CELADON_FIXES
+ token.pixel_w = container.token.pixel_w+(pick(6, -6))
+ token.pixel_z = container.token.pixel_z+(pick(6, -6))
+ //[/CELADON-ADD]
x = container.x
y = container.y
docked_to.contents -= src
diff --git a/code/modules/overmap/overmap_token.dm b/code/modules/overmap/overmap_token.dm
index 7f152f889e7e..a6c8adb0dc62 100644
--- a/code/modules/overmap/overmap_token.dm
+++ b/code/modules/overmap/overmap_token.dm
@@ -36,12 +36,12 @@
// [CELADON-ADD] - OVERMAP ICON - Это вагабонд насрал
if(istype(parent, /datum/overmap/ship/controlled))
if(!move_vec)
- move_vec = new (loc)
+ move_vec = new (src)
move_vec.icon = 'mod_celadon/_storge_icons/icons/overmap/overmap.dmi'
move_vec.icon_state = "movement_vector"
move_vec.layer = move_vec.layer+1
if(!ship_image)
- ship_image = new (loc)
+ ship_image = new (src)
ship_image.icon = 'mod_celadon/_storge_icons/icons/overmap/overmap.dmi'
ship_image.icon_state = "ship"
ship_image.layer = ship_image.layer+2
diff --git a/code/modules/overmap/ships/ship_datum.dm b/code/modules/overmap/ships/ship_datum.dm
index 5da47ae72199..ff861848ed00 100644
--- a/code/modules/overmap/ships/ship_datum.dm
+++ b/code/modules/overmap/ships/ship_datum.dm
@@ -202,6 +202,11 @@
speed_y = speed_y+vector_to_add["y"]
vector_to_add["x"] = 0
vector_to_add["y"] = 0
+
+ if(60 SECONDS * MAGNITUDE(speed_x, speed_y) >= 60)
+ speed_x = speed_x*0.98
+ speed_y = speed_y*0.98
+
// [/CELADON-EDIT]
update_visuals()
From 7d3e83b4737dc8a02b297d9979fe29b8b5f5cb20 Mon Sep 17 00:00:00 2001
From: Mr_DarkBladeS <48252701+MysticalFaceLesS@users.noreply.github.com>
Date: Sun, 20 Oct 2024 22:58:50 +0300
Subject: [PATCH 3/4] Change count events of overmap for local test
---
config/game_options.txt | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/config/game_options.txt b/config/game_options.txt
index 7f8eb1726a3b..9c46eb7865f0 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -337,7 +337,7 @@ NEAR_DEATH_EXPERIENCE
## Set to 1 for "custom", silicons will start with the custom laws defined in silicon_laws.txt. (If silicon_laws.txt is empty, the AI will spawn with asimov and Custom boards will auto-delete.)
## Set to 2 for "random", silicons will start with a random lawset picked from random laws specified below.
## Set to 3 for "weighted random", using values in "silicon_weights.txt", a law will be selected, with weights specifed in that file.
-DEFAULT_LAWS 0
+DEFAULT_LAWS 2
## RANDOM LAWS ##
## ------------------------------------------------------------------------------------------
@@ -352,10 +352,10 @@ RANDOM_LAWS robocop
RANDOM_LAWS corporate
## Quirky laws. Shouldn't cause too much harm
-#RANDOM_LAWS hippocratic
-#RANDOM_LAWS maintain
+RANDOM_LAWS hippocratic
+RANDOM_LAWS maintain
#RANDOM_LAWS drone
-#RANDOM_LAWS liveandletlive
+RANDOM_LAWS liveandletlive
#RANDOM_LAWS peacekeeper
#RANDOM_LAWS reporter
#RANDOM_LAWS hulkamania
@@ -434,11 +434,10 @@ ROUNDSTART_RACES felinid
ROUNDSTART_RACES kepori
ROUNDSTART_RACES rachnid
ROUNDSTART_RACES vox
-
## [CELADON-ADD] - TAJARA, CELADON_RIOL, LANIUS
ROUNDSTART_RACES tajara
-ROUNDSTART_RACES riol
ROUNDSTART_RACES lanius
+ROUNDSTART_RACES riol
## [/CELADON-ADD]
## Races that are better than humans in some ways, but worse in others
@@ -572,27 +571,27 @@ ECONOMY
## Overmap Settings ##
## Put max amount of different event clusters you want to spawn here
-MAX_OVERMAP_EVENT_CLUSTERS 6
+MAX_OVERMAP_EVENT_CLUSTERS 27
## Put the maximum amount of overmap events here
-MAX_OVERMAP_EVENTS 50
+MAX_OVERMAP_EVENTS 500
## Put the maximum amount of dynamic overmap locations here
MAX_OVERMAP_DYNAMIC_EVENTS 10
## Size of the overmap squared
-OVERMAP_SIZE 12
+OVERMAP_SIZE 30
## Which overmap generator to use
## Valid values are: "random", "solar_system"
OVERMAP_GENERATOR_TYPE solar_system
## Size of overmap encounters, vertical and width with a 3 tile border
-OVERMAP_ENCOUNTER_SIZE 191
+OVERMAP_ENCOUNTER_SIZE 100
## The time required before a ship is allowed to bluespace jump. -1 disables it entirely
## In deciseconds, valid values are -1 to INFINITY
-BLUESPACE_JUMP_WAIT 12000
+BLUESPACE_JUMP_WAIT 1200
## Whether this server is an authentication server
#AUTH_ONLY
From b1b9a22b477fa540f8f0541a92619dd90b402937 Mon Sep 17 00:00:00 2001
From: Mr_DarkBladeS <48252701+MysticalFaceLesS@users.noreply.github.com>
Date: Mon, 21 Oct 2024 01:37:17 +0300
Subject: [PATCH 4/4] No more everyone..
---
mod_celadon/wideband/code/signal.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mod_celadon/wideband/code/signal.dm b/mod_celadon/wideband/code/signal.dm
index 9356c1d31899..bbf95cf69863 100644
--- a/mod_celadon/wideband/code/signal.dm
+++ b/mod_celadon/wideband/code/signal.dm
@@ -23,9 +23,9 @@
GLOB.news_network.SubmitArticle("Получен сигнал S.O.S.
Наши локаторы получили сигнал бедствия, который исходит от судна '" + name + "' по координатам: X - " + x + " / Y - " + y + ".
" + name + " запрашивает скорейшей помощи!", "Outpost Distress Beacon System", "Колониальная сеть объявлений", adminMessage = 0, allow_comments = 1)
// Отправляем сообщения в Discord о помощи в чат Shiptest`a.
if(CONFIG_GET(string/servername) == "\[RU] Celadon Shiptest: Alpha")
- send2chat("<:Celadon:1200703387717619814> \[Shiptest: Alpha] > Внимание! Судно **" + name + "** подаёт сигнал бедствия **S.O.S.** на координатах: **X - " + x + "** / **Y - " + y + "**.", "round-report")
+ send2chat("<:Celadon:1200703387717619814> \[Shiptest: Alpha] > Внимание! Судно **`" + name + "`** подаёт сигнал бедствия **S.O.S.** на координатах: **X - " + x + "** / **Y - " + y + "**.", "round-report")
if(CONFIG_GET(string/servername) == "\[RU] Celadon Shiptest: Beta")
- send2chat("<:Celadon:1200703387717619814> \[Shiptest: Beta] > Внимание! Судно **" + name + "** подаёт сигнал бедствия **S.O.S.** на координатах: **X - " + x + "** / **Y - " + y + "**.", "round-report")
+ send2chat("<:Celadon:1200703387717619814> \[Shiptest: Beta] > Внимание! Судно **`" + name + "`** подаёт сигнал бедствия **S.O.S.** на координатах: **X - " + x + "** / **Y - " + y + "**.", "round-report")
// Логируем действия.
message_admins("[key_name_admin(usr)] send signal S.O.S.")
log_admin("[key_name(usr)] - [key_name(src)] send signal S.O.S.")