-
Notifications
You must be signed in to change notification settings - Fork 95
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
Freelancer platoon part 1, the basics #226
Conversation
MONEY MONEY MONEY MONEY
@@ -248,7 +248,7 @@ | |||
/datum/ammo/rocket/wp/upp/do_at_max_range(obj/projectile/P) | |||
drop_flame(get_turf(P), P.weapon_cause_data) | |||
|
|||
/datum/ammo/rocket/wp/quad | |||
/datum/ammo/rocket/wp/quad |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
guh
code/datums/ammo/rocket.dm
Outdated
@@ -272,6 +272,22 @@ | |||
drop_flame(get_turf(P), P.weapon_cause_data) | |||
explosion(P.loc, -1, 2, 4, 5, , , ,P.weapon_cause_data) | |||
|
|||
/datum/ammo/rocket/wp/quad/quadcucked |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fucked up naming, change it to "weak" or something
/datum/job/marine/medic/ai/forecon = JOB_SQUAD_MEDIC,\ | ||
/datum/job/marine/tl/ai/forecon = JOB_SQUAD_TEAM_LEADER,\ | ||
/datum/job/marine/smartgunner/ai/forecon = JOB_SQUAD_SMARTGUN))) | ||
/datum/job/marine/leader/ai = JOB_SQUAD_LEADER,\ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use tabs instead of spaces
@@ -80,4 +80,4 @@ AddTimelock(/datum/job/command/bridge, list( | |||
job = /datum/job/command/bridge/ai/upp | |||
|
|||
#undef SECOND_LT_VARIANT | |||
#undef FIRST_LT_VARIANT | |||
#undef FIRST_LT_VARIANT |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
newline
#undef LCPL_VARIANT | ||
#undef CPL_VARIANT | ||
#undef CPL_VARIANT |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
newline
@@ -1071,7 +1071,109 @@ | |||
damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_6 | |||
recoil_unwielded = RECOIL_AMOUNT_TIER_2 | |||
|
|||
//PVE 177, for lancers, updated with better desc no attachies on spawn and other stuff :) | |||
/obj/item/weapon/gun/rifle/xm177repro |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not make it a subtype of default xm177?
//------------------------------------------------------- | ||
//PVE M16 Grenadier, EAT 40 XENO SCUM | ||
/obj/item/weapon/gun/rifle/m16/grenadierrepro |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this too
@@ -1705,6 +1807,62 @@ | |||
current_mag = /obj/item/ammo_magazine/rifle/l42a/rubber | |||
|
|||
//------------------------------------------------------- | |||
//L42A Battle Rifle FAL ripoff edition | |||
|
|||
/obj/item/weapon/gun/rifle/l42B |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this too
|
||
//Type-19 lancer | ||
|
||
/obj/item/weapon/gun/smg/pps43lancer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this too
@@ -415,6 +456,25 @@ | |||
damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_3 | |||
recoil_unwielded = RECOIL_AMOUNT_TIER_5 | |||
|
|||
/obj/item/weapon/gun/smg/bizonlancer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
erm you get what i mean
So, question: We have a bunch of ragtag guns in the code already that are overall worse than faction guns but do a decent enough job. Why all the new weapons? |
the /lancer variants fix bizon and the ppsh 43 to not have the spread of a shotgun blast. the /repro variants add full auto, remove starting random attachments, and update the lore to not be weird out of place guns from the past in the future. the lancer variant of the minigun has updated lore. and the L42B contains full auto, separate bullets from pulse so you cant just find a single pulse rifle mag and be set for a while, and an updated sound to not be as weak with the full auto. more FAL like L42 variant |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
About the pull request
Adds a platoon of freelancer mercs. lays out the groundwork for further additions (better sprites, more lore, maybe even return to OG gunny weapon plan of FLASH).
Major features include: Fuckton of stolen or bought weaponry in the armory, not too much ammo of one type to simulate the feel of ammo scarcity among the mercs, but not actual little amount of ammo so you arent fucked if an unnamed person takes 16 mags every round.
Lack of PlatCo, mercs wouldnt really have an overwatch system AND if they had a real "officer" type it would be the captain, and then who would the GMs have to give orders from and call about situation and such. replaced with totally original RTO idea i have not taken from the tried and tested FORECON platoon.
New shipmap, not much to say about it im not the best mapper.
A single squad, the idea is it adds to the unmanaged hoodlum aspect, but im willing to fold if its too much trouble player wise to manage (will see if its the case if it ever gets a playtest), they still get gunny and a sqsgt so they can always divy up ingame between them
Explain why it's good for the game
More options for GMs to do missions, more RP opportunity for the players in a VERY different than all current platoons platoon. Bane can complete pirate larp
Changelog
🆑
add: Added FL platoon and all its goodies
add: Framework for a secondary gunny weapon to replace current flamer in part 2 if it works
mapadd: added the SS Corsair, the totally not shady civilian transport vessel
/:cl: