Skip to content

BALANCE: Renegade-Rondo Ramzi Ship #2709

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

Merged
MysticalFaceLesS merged 6 commits into from
Feb 7, 2026
Merged

BALANCE: Renegade-Rondo Ramzi Ship #2709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bb6b7ef
ADD: Ramzi Pirate vs Enemy Simple Mobs
KOCMODECAHTHUK Jan 5, 2026
6669533
add: Sprite and fix faction
KOCMODECAHTHUK Feb 1, 2026
2bfd047
add: Sprite and Desc
KOCMODECAHTHUK Feb 5, 2026
5009253
spellcheck: name renegate
KOCMODECAHTHUK Feb 5, 2026
f0cb805
ugh
KOCMODECAHTHUK Feb 5, 2026
bc87f39
Spellcheck: fix RENEGATE
KOCMODECAHTHUK Feb 6, 2026
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
4 changes: 2 additions & 2 deletions _maps/_mod_celadon/configs/pirate_rondo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "https://raw.githubusercontent.com/CeladonSS13/Shiptest/beta-dev/_maps/_mod_celadon/ship_config_schema.json",
"map_name": "Rondo-class Assault Vessel",
"map_name": "Rondo-class Renegade Assault Vessel",
"map_short_name": "Rondo",
"description": "'Rondo' - судно ранее используемое синдикатом как разведывательное, изначально снабжалось системой оптического камуфляжа. Однако из-за несовершенства технологии, любое повреждение экранирования приводило к полному отключению систем, в связи с чем судну требовался длительный ремонт. Ко всему прочему, использование технологии оптического камуфляжа, а тем более его ремонт требовали высокую степень квалификации экипажа, в результате чего система камуфляжа была снята, а сами суда из-за своей малой эффективности отправлены на утилизацию в верфи конструкторского бюро. От полного уничтожения данные суда были спасены во время рейда группировкой Рамзи верфей, благодаря чему некоторые экземпляры попали на черный рынок, а оставшиеся до сих пор находятся во владении некоторых боевых формирований.",
"description": "'Rondo' - Cудно ранее используемое синдикатом как разведывательное, изначально снабжалось системой оптического камуфляжа. Однако из-за несовершенства технологии, любое повреждение экранирования приводило к полному отключению систем, в связи с чем судну требовался длительный ремонт. Ко всему прочему, использование технологии оптического камуфляжа, а тем более его ремонт требовали высокую степень квалификации экипажа, в результате чего система камуфляжа была снята, а сами суда из-за своей малой эффективности отправлены на утилизацию в верфи конструкторского бюро. От полного уничтожения данные суда были спасены во время рейда группировкой Рамзи, благодаря чему некоторые экземпляры попали на черный рынок, а оставшиеся до сих пор находятся во владении некоторых боевых формирований, в том числе и Ренегатов.",
"map_path": "_maps/_mod_celadon/shuttles/pirate/pirate_rondo.dmm",
"enabled" : true,
"limit": 1,
Expand Down
37 changes: 11 additions & 26 deletions _maps/_mod_celadon/shuttles/pirate/pirate_rondo.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,7 @@
/area/ship/security/armory)
"da" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable{
icon_state = "0-1"
},
/obj/structure/cable,
/obj/effect/spawner/bunk_bed{
dir = 1
},
Expand Down Expand Up @@ -614,11 +612,11 @@
pixel_x = 9;
pixel_y = 5
},
/obj/item/grenade/spawnergrenade/manhacks{
pixel_y = -5;
pixel_x = -8
/obj/item/grenade/spawnergrenade/manhacks/ramzi{
pixel_x = -8;
pixel_y = -5
},
/obj/item/grenade/spawnergrenade/manhacks{
/obj/item/grenade/spawnergrenade/manhacks/ramzi{
pixel_x = -8
},
/obj/item/grenade/spawnergrenade/spesscarp{
Expand Down Expand Up @@ -707,9 +705,7 @@
/obj/machinery/power/terminal{
dir = 8
},
/obj/structure/cable{
icon_state = "0-1"
},
/obj/structure/cable,
/turf/open/floor/plating,
/area/ship/engineering)
"jl" = (
Expand Down Expand Up @@ -934,9 +930,7 @@
preferred_direction = 4;
port_direction = 2
},
/obj/structure/cable{
icon_state = "0-1"
},
/obj/structure/cable,
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"lY" = (
Expand Down Expand Up @@ -974,7 +968,6 @@
dir = 8
},
/obj/structure/window/reinforced{
icon_state = "rwindow";
dir = 1
},
/obj/machinery/power/smes/shuttle/precharged,
Expand Down Expand Up @@ -1364,9 +1357,7 @@
/area/ship/security/armory)
"tP" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable{
icon_state = "0-1"
},
/obj/structure/cable,
/obj/machinery/light_switch{
dir = 1;
pixel_x = 12;
Expand Down Expand Up @@ -2602,7 +2593,6 @@
dir = 8
},
/obj/structure/window/reinforced{
icon_state = "rwindow";
dir = 1
},
/obj/structure/cable{
Expand Down Expand Up @@ -2698,8 +2688,7 @@
dir = 6
},
/obj/structure/cable{
icon_state = "2-4";
tag = null
icon_state = "2-4"
},
/obj/effect/turf_decal/corner/opaque/syndiered/half{
dir = 8
Expand Down Expand Up @@ -2995,9 +2984,7 @@
/obj/machinery/door/firedoor/border_only{
dir = 1
},
/obj/structure/cable{
icon_state = "0-1"
},
/obj/structure/cable,
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"LL" = (
Expand Down Expand Up @@ -3740,9 +3727,7 @@
/area/ship/engineering)
"YU" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable{
icon_state = "0-1"
},
/obj/structure/cable,
/obj/structure/closet/crate/bin,
/obj/machinery/light_switch{
pixel_y = -12;
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/~mod_celadon/names.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#define FACTION_UNKNOWN "Unknown"

#define FACTION_RAMZI "Ramzi Clique"
#define FACTION_RAMZI_RENEGADE "Ramzi Renegade" // [CELADON-ADD]
#define FACTION_SRM "Saint-Roumain Militia"
#define FACTION_CLIP "CLIP Minutemen"
#define FACTION_FRONTIER "Frontiersmen Fleet"
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/porta_turret/turret_types/ship_turret_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
stun_projectile_sound = 'sound/weapons/gun/rifle/hydra.ogg'
lethal_projectile = /obj/projectile/bullet/a556_42
lethal_projectile_sound = 'sound/weapons/gun/rifle/hydra.ogg'
faction = list(FACTION_RAMZI, FACTION_TURRET)
faction = list(FACTION_RAMZI_RENEGADE, FACTION_TURRET) // [CELADON-ADD] - RAMZI-RENEGATE
max_integrity = 180
shot_delay = 16
burst_delay = 8
Expand Down
5 changes: 5 additions & 0 deletions code/game/objects/items/grenades/spawnergrenade.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
spawner_type = /mob/living/simple_animal/hostile/viscerator
deliveryamt = 10

// [CELADON-ADD] - RAMZI-RENEGATE
/obj/item/grenade/spawnergrenade/manhacks/ramzi
spawner_type = /mob/living/simple_animal/hostile/viscerator/ramzi
// [/CELADON-ADD]

/obj/item/grenade/spawnergrenade/spesscarp
name = "carp delivery grenade"
spawner_type = /mob/living/simple_animal/hostile/carp
Expand Down
5 changes: 5 additions & 0 deletions code/modules/mob/living/simple_animal/hostile/human/syndicate.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,3 +678,8 @@
/mob/living/simple_animal/hostile/viscerator/Initialize()
. = ..()
AddComponent(/datum/component/swarming)

// [CELADON-ADD] - RAMZI-RENEGATE
/mob/living/simple_animal/hostile/viscerator/ramzi
faction = list(FACTION_RAMZI_RENEGADE, FACTION_RAMZI)
// [/CELADON-ADD]
Binary file modified mod_celadon/_storage_icons/icons/resprite/hud/hud.dmi
View file
Open in desktop
Binary file not shown.
21 changes: 10 additions & 11 deletions mod_celadon/outfit/code/pirate/ramzi.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
id = /obj/item/card/id/cel/ramzi
box = /obj/item/storage/box/survival/ramzi

faction_icon = "bg_pirate"
job_icon = "pirate"
faction_icon = "bg_ramzi"
job_icon = "ramzi"

backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
Expand All @@ -30,8 +30,8 @@

id_assignment = "Battle Master"
jobtype = /datum/job/captain
faction_icon = "bg_pirate"
job_icon = "piratecaptain"
faction_icon = "bg_ramzi"
job_icon = "ramzicaptain"

id = /obj/item/card/id/cel/ramzi/battlemaster
uniform = /obj/item/clothing/under/syndicate/ramzi/officer
Expand All @@ -40,7 +40,7 @@
suit = /obj/item/clothing/suit/armor/ramzi/officer

/datum/outfit/job/cel/pirate/ramzi/trooper
job_icon = "pirate"
job_icon = "ramzi"
name = "Ramzi Clique Rondo - Commando"

id_assignment = "Commando"
Expand All @@ -63,8 +63,8 @@
box = /obj/item/storage/box/survival/ramzi
id = /obj/item/card/id

faction_icon = "bg_pirate"
job_icon = "pirate"
faction_icon = "bg_ramzi"
job_icon = "ramzi"

backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel
Expand All @@ -75,7 +75,7 @@
. = ..()
if(visualsOnly)
return
H.faction |= list(FACTION_RAMZI)
H.faction |= list(FACTION_RAMZI_RENEGADE)

//Deckhand

Expand All @@ -91,10 +91,9 @@

/datum/outfit/job/cel/pirate/ramzi/captain
name = "Ramzi Clique - Captain"
job_icon = "piratecaptain"

faction_icon = "bg_pirate"
job_icon = "piratecaptain"
faction_icon = "bg_ramzi"
job_icon = "ramzicaptain"

jobtype = /datum/job/captain
uniform = /obj/item/clothing/under/syndicate/ramzi/officer
Expand Down