HvH faction remastering and adding: Vyacheslav Security Detail pt.1 #15844

SomrNetwork · 2024-05-11T06:36:24Z

About The Pull Request

With the climb of Campaign, I've gotten an inspiration to make and remaster some factions. Starting with my first, the Vyacheslav Security Detail. A Syndicate PMC squad sent to assist in ICC and SoM operations. Equipped with Crasher ballistic armor and Cold War weaponries. Consisting of the following:

The C550 Assault Rifle, chambered in 10x27mm

The L26 Support MG, chambered in 5.56mm

The C17 PDW, firing AP .45 ACP

The L12 pump-action Shotgun, 12 gauge

The XM104 'Divider' Revolver, firing incendiary .357

The C96 pistol, chambered in 9mm parabellum

The C153 shoulder launcher, fires HE and ~~Chemical warheads~~ Incendiary rounds

and the armory:

extras:

Why It's Good For The Game

Campaign seems to lack a few faction varieties. I want to assist in adding a slight amount of variation with lore, factions, guns and armor. And, since TGMC has slightly more factions than ICC/SoM, I wish to balance it too.

Changelog

🆑
add: vsd faction
add: New magfed revolvers!
imageadd: campaign portrait and UI
imageadd: VSD armor and weapons
balance: faction balance
/:cl:

vee ess dee

SomrNetwork · 2024-05-11T06:36:48Z

time to update the branch to current TGMC!!

…-Corps into VSD-faction

Tailiik · 2024-05-11T06:42:36Z

Looks good, you might wanna put a comment on the crasher armor declaration that it is used for your faction though so it doesn't get snapped when the mk3ening happens.

SomrNetwork · 2024-05-11T06:44:55Z

kuro doesn't touch much of the faction armors. I don't really think he'd touch the ERT crasher armor anyway

on another note
WHAT THE FUCK

lbnesquik · 2024-05-11T06:55:44Z

"We need bad guys for our f-"

The Russian PMC :

Lumipharon · 2024-05-11T07:23:45Z

bro how old is your branch, and did you just ignore all the conflicts when you pulled master?

SomrNetwork · 2024-05-11T07:24:31Z

bro how old is your branch, and did you just ignore all the conflicts when you pulled master?

this project started 3 months ago so

explode

renamed the copy and paste of NVG with the typepath of VSD NVG

Tonklaatech · 2024-05-11T09:08:35Z

Z TARDS RISE UP!!!

Lumipharon

My eyes are glazing over from the volume of gear you're adding, but here's a couple of things to fix

Lumipharon · 2024-05-11T09:09:36Z

code/__DEFINES/_radio.dm

+#define FREQ_VSD 1351
+#define MAX_ERT_FREQ 1351

 #define FREQ_AI 1351


Lumipharon · 2024-05-11T09:12:42Z

code/modules/clothing/glasses/glasses.dm

@@ -567,3 +567,136 @@
 /obj/item/clothing/glasses/night_vision/mounted/Initialize(mapload)
 	. = ..()
 	ADD_TRAIT(src, TRAIT_NODROP, NIGHT_VISION_GOGGLES_TRAIT)
+
+/obj/item/clothing/glasses/vsd/nvg


did you just copy paste the entire code for existing nvg's?

nvg's are now on nvg code, and freq fixed. Also fixes the gun on mobs

SomrNetwork · 2024-05-14T13:34:48Z

now waiting on kuro's sprite approvals

Lumipharon · 2024-05-14T22:26:15Z

yeah just an FYI I wouldn't even want to look at walance until sprites are reviewed.

also renamed the job titles from russian to english (pain)

…-Marine-Corps into VSD-faction

SomrNetwork · 2024-05-18T14:01:26Z

its been 3 days since Kuro's approval

code/datums/gamemodes/campaign/rewards/campaign_asset_jobs.dm

code/game/objects/effects/effect_system/smoke.dm

code/game/objects/items/explosives/grenades/explosive_grenades.dm

code/modules/clothing/glasses/glasses.dm

code/modules/clothing/head/helmet.dm

code/modules/projectiles/guns/rifles.dm

code/modules/projectiles/guns/shotguns.dm

code/modules/projectiles/guns/smgs.dm

code/modules/projectiles/guns/specialist.dm

code/datums/gamemodes/campaign/rewards/allies.dm

Lumipharon · 2024-05-19T08:01:05Z

wotdis sprite

its like not even the same palette as the other guns, and is just really low quality.

fixes everything but grenade and the color variant request

…-Marine-Corps into VSD-faction

riptide was disabled (FUCK riptide.......................)

SomrNetwork · 2024-05-19T13:41:55Z

time to annoy Lumi again!!

Lumipharon · 2024-05-21T03:41:43Z

code/datums/gamemodes/campaign/rewards/campaign_asset_jobs.dm

@@ -743,22 +743,22 @@ Fight for TGMC, and attempt to achieve all objectives given to you."})
 	job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS
 	job_cost = 0
 	outfits = list(
-		/datum/outfit/job/vsd/standard/c550/campaign,
+		/datum/outfit/job/vsd/standard/gruntone/campaign,


camel_case. /grunt_one. or just /one

Lumipharon · 2024-05-21T03:43:35Z

code/modules/clothing/glasses/night.dm

+	deactive_state = "vsd_nvg_off"
+	toggleable = TRUE
+	tint = COLOR_GREEN
+	item_flags = DELONDROP


Lumipharon · 2024-05-21T03:45:13Z

code/modules/projectiles/guns/rifles.dm

-		/obj/item/weapon/gun/flamer/mini_flamer,
-		/obj/item/weapon/gun/grenade_launcher/underslung,
-		/obj/item/weapon/gun/rifle/pepperball/pepperball_mini,
-		/obj/item/weapon/gun/grenade_launcher/underslung/mpi,


I was only questioning the mpi UGL btw, since thats just a normal UGL but with a custom sprite specifically to fit the MPI, and it is unremovable.

tgmc.dme

:3

…-Marine-Corps into VSD-faction

SomrNetwork · 2024-05-22T02:11:11Z

What the fuck tgstation bot

…-Marine-Corps into VSD-faction

SomrNetwork · 2024-05-25T09:42:26Z

i'm pretty sure this is still testmerged but yipee!!

Lumipharon · 2024-05-25T11:41:22Z

I wanted to tm for walance but ok

vsd

626d102

vee ess dee

tgstation-server added Sprites Changes to .dmi file. Merge Conflict Pull request is in a conflicted state with base branch. Balance Changes to functionality that modifies how effective certain methods are at powergaming. Feature New interesting mechanics with new interesting bugs labels May 11, 2024

Merge branch 'master' of https://github.com/tgstation/TerraGov-Marine…

b9827aa

…-Corps into VSD-faction

tgstation-server removed the Merge Conflict Pull request is in a conflicted state with base branch. label May 11, 2024

SomrNetwork added 4 commits May 11, 2024 15:41

test to see if it fixes some conflicts

b3d4033

explode

hopefully fixes

f376d2f

renamed the copy and paste of NVG with the typepath of VSD NVG

Merge branch 'master' into VSD-faction

ffa483c

Merge branch 'master' into VSD-faction

d644029

Lumipharon requested changes May 11, 2024

View reviewed changes

SomrNetwork added 2 commits May 14, 2024 20:22

does the change requests

83cca4f

nvg's are now on nvg code, and freq fixed. Also fixes the gun on mobs

Merge branch 'master' into VSD-faction

286baed

Kuro020 approved these changes May 16, 2024

View reviewed changes

SomrNetwork added 5 commits May 16, 2024 20:57

resprited and pallete armor and guns

e305e78

also renamed the job titles from russian to english (pain)

Merge branch 'VSD-faction' of https://github.com/SomrNetwork/TerraGov…

101c834

…-Marine-Corps into VSD-faction

Merge branch 'master' into VSD-faction

3940826

Merge branch 'master' into VSD-faction

c45c50b

Merge branch 'master' into VSD-faction

ba68480

Merge branch 'master' into VSD-faction

960c2d2

Lumipharon requested changes May 19, 2024

View reviewed changes

SomrNetwork added 6 commits May 19, 2024 18:19

surely this is balanced

31f3662

fixes everything but grenade and the color variant request

Merge branch 'VSD-faction' of https://github.com/SomrNetwork/TerraGov…

1f0acf1

…-Marine-Corps into VSD-faction

Merge branch 'master' into VSD-faction

0f70e58

hopefully fixes conflict

a7fcc4c

Merge branch 'VSD-faction' of https://github.com/SomrNetwork/TerraGov…

845597a

…-Marine-Corps into VSD-faction

should fix it now

30f6731

riptide was disabled (FUCK riptide.......................)

Lumipharon requested changes May 21, 2024

View reviewed changes

SomrNetwork added 4 commits May 21, 2024 21:14

last fix (pllease for the love of jod)

0c1fa81

Merge branch 'master' into VSD-faction

bed62a7

adds vsd weapons in valhalla seasonal vendor

9d45dd7

:3

Merge branch 'VSD-faction' of https://github.com/SomrNetwork/TerraGov…

5bb0403

…-Marine-Corps into VSD-faction

Lumipharon added the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label May 21, 2024

Merge branch 'master' into VSD-faction

0e6589b

tgstation-server removed the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label May 22, 2024

Merge branch 'master' into VSD-faction

b88b20a

comfyorange added a commit that referenced this pull request May 23, 2024

TGS Test Merge (#15844)

dcf2893

comfyorange added a commit that referenced this pull request May 23, 2024

TGS Test Merge (#15844)

ebd13fe

SomrNetwork added 2 commits May 24, 2024 20:31

fixes smoke for chemical warhead

c1eb1b1

Merge branch 'VSD-faction' of https://github.com/SomrNetwork/TerraGov…

de2d5c4

…-Marine-Corps into VSD-faction

TiviPlus merged commit 364f0db into tgstation:master May 25, 2024
34 checks passed

github-actions bot added a commit that referenced this pull request May 25, 2024

Automatic changelog for PR #15844 [ci skip]

c70a611

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

HvH faction remastering and adding: Vyacheslav Security Detail pt.1 #15844

HvH faction remastering and adding: Vyacheslav Security Detail pt.1 #15844

SomrNetwork commented May 11, 2024 •

edited

SomrNetwork commented May 11, 2024

Tailiik commented May 11, 2024

SomrNetwork commented May 11, 2024

lbnesquik commented May 11, 2024

Lumipharon commented May 11, 2024

SomrNetwork commented May 11, 2024

Tonklaatech commented May 11, 2024

Lumipharon left a comment

Lumipharon May 11, 2024

Lumipharon May 11, 2024

SomrNetwork commented May 14, 2024

Lumipharon commented May 14, 2024

SomrNetwork commented May 18, 2024

Lumipharon commented May 19, 2024

SomrNetwork commented May 19, 2024

Lumipharon May 21, 2024

Lumipharon May 21, 2024

Lumipharon May 21, 2024

SomrNetwork commented May 22, 2024

SomrNetwork commented May 25, 2024

Lumipharon commented May 25, 2024

HvH faction remastering and adding: Vyacheslav Security Detail pt.1 #15844

HvH faction remastering and adding: Vyacheslav Security Detail pt.1 #15844

Conversation

SomrNetwork commented May 11, 2024 • edited

About The Pull Request

Why It's Good For The Game

Changelog

SomrNetwork commented May 11, 2024

Tailiik commented May 11, 2024

SomrNetwork commented May 11, 2024

lbnesquik commented May 11, 2024

Lumipharon commented May 11, 2024

SomrNetwork commented May 11, 2024

Tonklaatech commented May 11, 2024

Lumipharon left a comment

Choose a reason for hiding this comment

Lumipharon May 11, 2024

Choose a reason for hiding this comment

Lumipharon May 11, 2024

Choose a reason for hiding this comment

SomrNetwork commented May 14, 2024

Lumipharon commented May 14, 2024

SomrNetwork commented May 18, 2024

Lumipharon commented May 19, 2024

SomrNetwork commented May 19, 2024

Lumipharon May 21, 2024

Choose a reason for hiding this comment

Lumipharon May 21, 2024

Choose a reason for hiding this comment

Lumipharon May 21, 2024

Choose a reason for hiding this comment

SomrNetwork commented May 22, 2024

SomrNetwork commented May 25, 2024

Lumipharon commented May 25, 2024

SomrNetwork commented May 11, 2024 •

edited