Commit Graph

23 Commits

Author SHA1 Message Date
Wallemations
3779dfe2a3 Merge branch 'master' into master 2020-09-07 21:42:22 -04:00
Fikou
123450725d adds trait injector mapping helper (#53473)
adds trait injector mapping helper and updates the traits_by_type list
thanks to anturk and mso
2020-09-07 21:59:39 -03:00
Wallemations
38424855f0 Adds Sign Language quirk 2020-08-12 20:36:18 -04:00
Ryll Ryll
dfcd304dcc Dismemberment wound tweaks, zombies are easy to wound/dismember, tweaks to head vulnerability (#52534)
* adds wound armor to helmets + such, nerfs standard head resist

* dismember + wound species balance, retitle traits
2020-07-30 01:18:57 -03:00
LemonInTheDark
dbdb2d33fe Merge conflict begone 2020-07-12 17:37:14 -07:00
tralezab
47c6ff7b7f Mafia Map Fixes and Removal (#52066)
* map fixes 😋

* removes necro for the time being

* lavaburn gone from update_fire code

* trait system (pog)

* small fix :)
2020-07-12 13:26:29 +02:00
LemonInTheDark
235f23214f into the pits of hell 2020-07-08 21:40:11 -07:00
MrMelbert
3b851845d4 Minor Adjustments to the "Brain Tumor" Quirk (#51770)
* brain tumor adjustments

* some requested changes + defines

* trait

* READ

* > self-merging

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-07-05 18:21:41 -04:00
Ryll Ryll
5c174800fb Grenades and projectiles can have shrapnel and embed, all carbons can suffer embeds, some bullets can ricochet, sizable refactor of embedding (#49634)
About The Pull Request

It annoyed me that we have a perfectly good frag grenade item, and a perfectly good shrapnel component, but no crossover episode between the two. This remedies that, and does a lot, lot more.

dreamseeker_2020-03-30_05-01-13.png

dreamseeker_2020-03-30_05-01-26.png

Big points:

    Adds new component: pellet_cloud, which can be used by ammo casings, guns, and landmines to spray shrapnel and display aggregate hit messages ("You're hit by 6 buckshot pellets!" vs "You're hit by the buckshot pellet in the X" x6). All gun ammo that shoot multiple pellets now use this component on firing.
    Adds stingbangs, premium less-lethal grenades that shoot off lots of stinger pellets, to cargo. Frag grenades are also reworked to have smaller booms, but shoot off lots of shrapnel shards. You can jump on top of these grenades to absorb a portion of the shrapnel to save those around you! There's an achievement for dying this way, called "Look Out, Sir!"
    Projectiles can now embed items/shrapnel. Adds .38 DumDum ammo to cargo that does less damage and has negative armor pen, but can embed in people. This is the only ammo that currently embeds.
    Bullets can now ricochet off walls, structures, and machinery (harder surfaces are more likely to ricochet). Only standard .38 and Match Grade .38/.357/L6 ammo can ricochet, with Match Grade being much better at ricocheting. You can buy Match Grade .38 from cargo and Match Grade L6 ammo from the nuke uplink, while Match .357 is admin only.
    Armor now protects you from harmful embeds, taking the better of the bullet/bomb armor on the affected limb. Armor penetration can modify this of course, and many blunt embeds like stingbangs and DumDum bullets are significantly worse if you have even 1 armor.

Other misc fixes/changes

    Refactored the embed element a bunch and fixed it creating new elements for every instance rather than expected bespoke behavior. There are new /obj/item helpers for modifying and adding embedding.
    Fixes #49989: Spears can no longer embed in turfs cause their sprite is annoying to me, it's generally harder for most things to embed in turfs
    Fixes #49741: New carbon helpers for removing embedded objects
    Fixes #46416: Handles embedded objects getting qdel'd or moved while embedded
    Renamed the old shrapnel component for RPG loot to MIRV to avoid confusion
    Repathed frag grenades from under minibombs to under base grenades, and added explosion vars to base grenades

Why It's Good For The Game

Fixes a bunch of janky design with embeds, adds lots of new avenues for projectile and grenade variety, ricochets and collateral damage are fun!
Changelog

🆑 Ryll/Shaps
add: Adds stingbangs to cargo (and one in the sec vendor premium), premium less-lethal grenades that shoot off a giant swarm of stingball pellets to help incapacitate swarms of people in tight quarters. You can jump on top of a live one to be a hero and absorb a bunch of shrapnel, same with frag grenades. There's even an achievement for dying to a grenade you jumped on!
add: Projectiles can now embed in people! Or at least grenade shrapnel and the new .38 DumDum ammo, now available in cargo, can. DumDum rounds excel against unarmored targets, but are pricey and do poorly against armored targets.
add: Bullets can now ricochet! Or at least, standard .38 and the new .38/L6 Match Grade ammo can. Match Grade ammo is finely tuned to ricochet easier and seek targets off bounces better, and can be purchased from cargo (for the .38) or nuke ops uplink (for the L6), but standard .38 ammo has a chance to ricochet as well.
tweak: Frag grenades now have smaller explosions but shoot off a bunch of devastating shrapnel, excellent for soft targets!
tweak: Shotguns and other multi-pellet guns now print aggregate messages, so you'll get one "You've been hit by 6 buckshot pellets!" rather than 6 "You've been hit by the buckshot pellet in the X!" messages. Bye bye lag!
balance: Armor can now protect against embedding weapons, taking the best of either the bullet or bomb armor for the limb in question away from the embed chance. Some weapons are better at piercing armor than others!
/🆑
2020-04-03 16:58:38 +13:00
necromanceranne
12221be2b9 The Infiltrator Sneaksuit Bundle: Armor for (relatively) Cheap (#49608)
About The Pull Request

Redoing the pull request because it's changed so fucking much. Original over here #49550.

The Infiltrator Bundle is a sneaksuit set that allows the wearer the benefits of a decent armor set at a relatively low price of 6TC. The armor vest paired with the sneaksuit will equal a syndicate hardsuit, but only on the chest. It also carries none of the benefits of the hardsuit, such as EVA.

The bundle comes complete with the following items:

Infiltrator Helmet: It's a insidious helmet. Has flashproofing.
Infiltrator Vest: It's roughly equal to an armor vest, but a lot wearker against lasers and disablers.
Blood-red Sneaksuit: It's the highest armored undersuit in the game, at 10 across the board.
Infiltrator Balaclava: Equal to an explorer mask in armor, and has a diagnostic hud built in. It also distorts your voice, so you always come up as 'Unknown' when speaking, even when you have another ID on. Obviously has anti-syngery with the Agent Card, but you're not wearing this to disguise as other people.
Infiltrator Gloves: Special combat gloves that allow you to fireman carry people more quickly.
Sneakboots: They muffle your footsteps completely!
Carrying Case: Storage container for the full suit and guns if you have them. Guns not included.

Also includes the Sleepytime Pajama Bundle for nukies.

Zawo and I have been passing this between us for a while trying to get this into a good state. Hopefully now it's worth an inclusion.
Why It's Good For The Game

A cheaper alternative to the Syndicate Balloon to indicate to everyone around you that you are probably valid.

A recognizable outfit that proves to be useful in minor ways and provide cheap armor for traitors. Nothing this grants is especially powerful on it's own, but it is a useful for traitors wanting to gain an edge at low cost.
Changelog

🆑 NecromancerAnne and zawo
add: The Infiltrator Bundle, an armor kit for 6TC. Murder people in style!
add: Some pajamas for nukies to get plenty of bed rest.
/🆑
2020-03-17 20:31:31 +13:00
spookydonut
eaf8d2496e Makes spacewalk a trait (#49590)
About The Pull Request

less vars, lets you make stuff spacewalk via a trait
2020-03-16 20:34:55 +13:00
Ryll Ryll
f9963454db Adds tackling (VIDEO INSIDE) (#49476)
* huthtuthuthuthtuhtuthuthuthuthtuthuthuthtuthut

* documents and expands, adds new glove types

* Adds slamming into tables and neatens up throwingdatum handling (+stuff)

* bit less squishy

* adds sprites, offbrands, swaps most combat insuls for tacklers

* adds dolphin and rocket gloves to BEPIS

* changes dna to traits, buffs tackling

* same as last commit but moreso

* updates docs, nerfs stuns

* vending machines, better docs

* window tackles for good measure

* gets window splats working

* polish off

* LAST DAY OF SCHOOL
2020-03-06 11:17:52 +08:00
Jordan Brown
024d4d8581 Makes bloodcrawling a trait instead of a var (#49572) 2020-03-05 01:57:58 -05:00
zxaber
de3b9a04ee Ash Walker flavor text, balance changes (#49316)
* Ashen One

May the flames guide thee

* Update code/game/objects/structures/ghost_role_spawners.dm

Co-Authored-By: XDTM <heliumt@yahoo.it>

* update

* caught it before I got yelled at

* updates

* Update code/game/objects/structures/ghost_role_spawners.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Update code/game/objects/structures/ghost_role_spawners.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* spaced the spaces

tab good space bad

Co-authored-by: XDTM <heliumt@yahoo.it>
Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-03-02 19:25:33 -05:00
Flint
ad3115af02 Puners 2020-02-07 22:35:57 -06:00
Ryll Ryll
15093aeb95 Clowns are too sweet to understand death (#48863)
About The Pull Request

Dead people just look like they're sleeping to clowns. Antag clowns are NO LONGER immune from this.
Why It's Good For The Game

Someone in OOC said it'd be funny if clowns thought dead people were just sleeping, and I felt inspired to champion this worthy cause. Surely there's no way this could cause administrative issues or confusion.
Changelog

🆑 Ryll/Shaps
tweak: Clowns are now unable to conceptualize death and think corpses of people are simply sleeping.
/🆑
2020-01-28 10:10:37 +13:00
skoglol
c471f51dff Merge pull request #48647 from ShizCalev/tesla-shock-refund-fix
Fixes tesla immunity being lost if you have reactive armor and refund the lighting bolt spell / vice versa
2020-01-08 11:17:00 +01:00
ShizCalev
e4b6ad7982 Adds missing traits to the badmin trait panel. 2020-01-06 21:15:56 -05:00
ShizCalev
0432f132fb Fixes tesla immunity being lost if you have reactive armor and refund the lighting bolt spell / vice versa 2020-01-06 21:04:44 -05:00
tralezab
160982c116 [READY]New Plasma Fist Finale: Apotheosis! (#47955)
* relic file

* Revert "Merge branch 'master' of https://github.com/tralezab/tgstation"

This reverts commit 826916d87b421dbb0ebcfce7fad96e456b6d3674, reversing
changes made to a0f476d874.

* a couple runtimes to kill, otherwise ready

* beam animation

* removes bad idea lol

* more panache

* fixes spelling

* nobomb mode

* nobomb granter

* sanity for levelling, plasma cap is now a var

* DO YOU LIKE... MY CAR...

* reviews handled, again

* more reviews! 🔪
2019-12-12 12:04:51 +01:00
spookydonut
f15f3b1de0 Makes TRAIT_NOCLONELOSS mobs immune to clone damage (#47976)
* Fixes #45378

* Update code/modules/mob/living/damage_procs.dm

* Update code/modules/mob/living/damage_procs.dm
2019-12-02 10:21:33 +01:00
Yaki
46d57ae96a Skeletons Can No Longer Be Hugged By Facehuggers: Take 2 (#46959)
* creates the xeno immunity trait for skeletons

* creates globalvar for xeno immmunity

* gives skeletons the xeno immunity trait

* makes the hugger check for xeno immunity

* checks for xeno immunity trait over embryo and hivenode

* adds the xeno immunity trait with hivenode

* adds xeno immunity trait when impregnated

* whoops fixed the number of macro args

* okay NOW it should be fixed

* there now it should b gucci
2019-10-18 19:46:13 -04:00
AnturK
714c61c70f Adds way to add/remove traits for admins (#45503) 2019-07-29 02:21:22 -07:00