Commit Graph

48 Commits

Author SHA1 Message Date
SkyratBot
4f92744cd7 [MIRROR] Removes an unused trait. Adds another to the traits global list. (#7339)
* Removes an unused trait. Adds another to the traits global list. (#60584)

Drunk healing is handled by the quirk itself. The trait is pointless.
I forgot add the uncatchable trait to the global list for admin shenanigeans.

* Removes an unused trait. Adds another to the traits global list.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-08-03 20:05:03 +01:00
SkyratBot
71f57e4a98 [MIRROR] Stop ethereals reviving during Mafia games (#6942)
* Stop ethereals reviving during Mafia games (#60210)

* Stop ethereals reviving during Mafia games

Co-authored-by: coiax <yellowbounder@gmail.com>
2021-07-16 01:50:09 +01:00
SkyratBot
df651808d4 [MIRROR] Drastic Lag Mitigation Subsystem: SSlag_switch (#6786)
* Drastic Lag Mitigation Subsystem: SSlag_switch (#59717)

Requested by oranges and inspired by the upcoming event. A new subsyetem, non-processing (for now), aimed at providing some toggle switches that can be flipped as a last ditch effort to save some CPU cycles by sacrificing some non-critical mechanics. Below you can see each individual toggle.

Screenshot of the admin panel:
image
Surely there are more opportunities for toggles I missed, but adding new ones is not very difficult at all.
Why It's Good For The Game

Better performance during extreme pop, I hope.
Changelog

cl
code: Introduces the Lag Switch subsystem for when a smoother experience is worth trading a few bells and whistles for. Performance enhancement measures can be togged by admins with the Show Lag Switches admin verb or enabled automatically at a pop amount set via config.
config: Added a new config var: number/auto_lag_switch_pop

* Drastic Lag Mitigation Subsystem: SSlag_switch

* mirrored the changes to the modular file

Co-authored-by: Wayland-Smithy <64715958+Wayland-Smithy@users.noreply.github.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
2021-07-08 03:24:16 +02:00
SkyratBot
56f2e79a0a [MIRROR] Agent ID cards now jump to the front of wallets and can disguise other more powerful ID cards. (#6433)
* Change agent ID cards to jump to the front of wallets; disguise other more powerful ID cards (#59652)

Many moons after I reworked ID cards, I feel the Agent ID card needs a little bit of extra love.

This change adds an option during forging which allows the user to specify whether the agent ID card will force itself to the front-facing/visible ID slot in wallets.

This provides traitors with a way to effectively disguse any special ID cards and accesses they may have without making the agent ID card a must-buy TC tax. If your traitor strategy involves gathering many ID cards, this is a definite buff to an item that took a heavy hit to power in the rework.

* Agent ID cards now jump to the front of wallets and can disguise other more powerful ID cards.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-06-22 00:48:52 +01:00
SkyratBot
3e686bb271 [MIRROR] makes the web weaving mutation let you weave webs into cloth (#5723)
* makes the web weaving mutation let you weave webs into cloth (#59079)

* makes the web weaving mutation let you weave webs into cloth

Co-authored-by: Clyde-Thunderpants <80003925+Clyde-Thunderpants@users.noreply.github.com>
2021-05-15 19:54:03 +01:00
SkyratBot
8ca47fe624 [MIRROR] High-danger plants like deathnettles now require botanical gloves to hold instead of any glove type (#5118)
* High-danger plants like deathnettles now require botanical gloves to hold instead of any glove type (#58503)

* High-danger plants like deathnettles now require botanical gloves to hold instead of any glove type

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2021-04-23 13:49:36 +01:00
SkyratBot
61647d09b4 [MIRROR] Renames TRAIT_MONKEYLIKE to TRAIT_DISCOORDINATED_TOOL_USER and fixes an issue with jungle fever (#4469)
* Renames TRAIT_MONKEYLIKE to TRAIT_DISCOORDINATED_TOOL_USER and fixes an issu with jungle fever (#57897)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Renames TRAIT_MONKEYLIKE to TRAIT_DISCOORDINATED_TOOL_USER and fixes an issue with jungle fever

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-03-28 03:02:24 +01:00
SkyratBot
c21aab1997 [MIRROR] Adds sticking metallic kitchenware into APCs (#4383)
* Adds sticking metallic kitchenware into APCs (#57910)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Adds sticking metallic kitchenware into APCs

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-03-25 03:49:36 +00:00
SkyratBot
b1b211c7b9 [MIRROR] Fixes an oversight with monkeys and revenant essence draining but my branch exists (#3832)
* Fixes an oversight with monkeys and revenant essence draining but my branch exists (#57368)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Fixes an oversight with monkeys and revenant essence draining but my branch exists

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-03-04 01:03:36 +00:00
SkyratBot
0e3a2d8577 [MIRROR] Fixes plasma lava limb conversion bug (#3532)
* Fixes plasma lava limb conversion bug

* Update human_update_icons.dm

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-02-20 16:18:48 +00:00
SkyratBot
731a995bcf [MIRROR] Improves Kissing (#3167)
* Improves Kissing (#56698)

Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>

* Improves Kissing

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
2021-02-07 09:41:24 +00:00
SkyratBot
577db30351 [MIRROR] Regular CTF no longer has wounding (#2652)
* Regular CTF no longer has wounding (#56093)

🆑 coiax
tweak: Regular Capture-The-Flag players can no longer be wounded.
Simulated participants in the Medieval Shuttle can still be violently
murdered with wounds however.
/🆑

CTF is very fast paced, and if you've taken damage without your shield,
you are nearly dead most of the time. However, if you do survive, you're
supposed to slowly heal, but wounds are untreatable on the battlefield.

People still being able to be bloodily stabbed in the Medieval Shuttle
is definitely a feature.

- Aliens (xenomorphs) are still immune to wounds, but that immunity is
  now done with a trait, rather than a typecheck.

* Regular CTF no longer has wounding

Co-authored-by: coiax <jack@billbuddy.co.uk>
2021-01-12 02:04:03 +01:00
SkyratBot
e05cca4ab4 [MIRROR] Rework job food/alchohol benefits into livers (#2648)
* Rework job food/alchohol benefits into livers  (#55721)

By moving the "special behaviour" of something like security officers
eating donuts, or engineers losing radiation by drinking Screwdrivers,
into traits on the liver, this makes the "origin" of that behaviour more
clearly defined, rather than something that's attached to the mind of
the person. (For example, now if a wizard mindswaps into a Security
Officer, they too can now digest donuts good.)

Having this behaviour be partially visible to the more medically
inclined members of the station (like doctors, and the chaplain for
"entrails reading mystic" themes), means that a dismembered liver tells
a story to those who know how to read it.

Some jobs have more "benefits" than others, for example the only thing
that the liver of a Quartermaster gives them is a sense of inadequacy
when consuming royal carpet.

Clowns having livers that honk make them easier to identify, and plays
into the retconned "bike horns are clown livers lore"? Also, why not cut
out a clown's liver then honk them with it? You monster.

* Rework job food/alchohol benefits into livers

Co-authored-by: coiax <jack@billbuddy.co.uk>
2021-01-12 01:50:22 +01:00
SkyratBot
56c647716b [MIRROR] Flesh to stone no longer makes you immune to bleeding, refactors bleedsuppress into a trait (#2640)
* Flesh to stone no longer makes you immune to bleeding, refactors bleedsuppress into a trait (#56078)

Being hit by the Flesh to Stone makes you bleed immune to prevent you from getting petrified while bleeding, and bleeding out while turned into stone. However, it doesn't make you vulnerable when you get unpetrified. This is a bug. This also makes bleedsuppress into a trait, as both is broken and should be a trait.

* Flesh to stone no longer makes you immune to bleeding, refactors bleedsuppress into a trait

Co-authored-by: Coffee <CoffeeDragon16@gmail.com>
2021-01-12 01:45:46 +01:00
SkyratBot
33ea04d223 [MIRROR] Clownlike creatures are now more consistent. #fix #honk #banana (#2423)
* Clownlike creatures are now more consistent. #fix #honk #banana (#55603)

* Bananium golems can wear clown shoes and are clumsy. Clownlike creatures, including clowns, bananium golems and clown ops, heal from bananas and bananahonk. Clown Ops also don't understand death, like real clowns!

* Clownlike creatures are now more consistent. #fix #honk #banana

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-01-01 14:40:59 +01:00
SkyratBot
50fbeb7f04 [MIRROR] Adds a minor negative quirk: Bad Touch (for the anti-huggers) (#2360)
* Adds a minor negative quirk: Bad Touch (for the anti-huggers)

* caw caw

* AAAA FIX INDENT

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Avunia Takiya <git@takiya.cloud>
2020-12-29 10:49:00 +01:00
SkyratBot
94ed7ed0f1 [MIRROR] Refactors how movetypes are added and removed, No timers this time. (#2358)
* Refactors how movetypes are added and removed, No timers this time. (#55444)

* Refactors how movetypes are added and removed, No timers this time.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-12-29 02:39:03 +00:00
SkyratBot
b14bd19855 [MIRROR] Remove TRAIT_ALWAYS_CLEAN from codebase (#2351)
* Remove TRAIT_ALWAYS_CLEAN from codebase (#55765)

Hygiene is no longer a thing, and the TRAIT_ALWAYS_CLEAN trait is not
actually used anywhere anymore. So it can be safely removed.

* Remove TRAIT_ALWAYS_CLEAN from codebase

Co-authored-by: coiax <yellowbounder@gmail.com>
2020-12-29 02:38:12 +00:00
SkyratBot
66c207e19c [MIRROR] Reverts (#54963) due to timer spam (#2109)
* Revert "Refactors how movetype flags are added and removed and the floating animation (#54963)" (#55432)

This reverts commit b8425c003a.

* Reverts (#54963) due to timer spam

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2020-12-10 05:58:05 +01:00
Azarak
cca1989af4 aaa (#2102) 2020-12-09 23:56:00 +01:00
SkyratBot
2ee5d422ae [MIRROR] Refactors how movetype flags are added and removed and the floating animation (#2096)
* Refactors how movetype flags are added and removed and the floating animation (#54963)

I wanted to refactor how movetype flags are added and removed into traits to prevent multiple sources of specific movement types from conflicting one other. I ended up also having to refactor the floating animation loop (the one that bobs up and down) code in the process.
Why It's Good For The Game

A way to avoid conflict from multiple sources of movement types.
This also stops melee attacks, jitteriness and update_transform() from temporarily disabling the floating movetype bitflag altogether until the next life tick.

Tested, but i'm pretty sure improvements could be made.
Changelog

cl
fix: jitteriness, melee attack animations and resting/standing up should no longer momentarily remove the floating movement type.
/cl

* Refactors how movetype flags are added and removed and the floating animation

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-12-09 23:43:42 +01:00
SkyratBot
c487c73f39 [MIRROR] Grep for space indentation (#1969)
* Grep for space indentation

* aa

* Update species.dm

* Update species.dm

* Update maps.dm

* Update examine.dm

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-01 12:26:41 +01:00
SkyratBot
964adb7828 [MIRROR] Fixes disabled limbs from compound fractures, only robotic limbs can be disabled by pure damage now (#1709)
* Fixes disabled limbs from compound fractures, only robotic limbs can be disabled by pure damage now (#54922)

* Fixes disabled limbs from compound fractures, only robotic limbs can be disabled by pure damage now

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2020-11-17 00:50:36 +01:00
SkyratBot
eedf2362cc [MIRROR] Refactored 'IsAdvancedToolUser' into a macro plus relative trait. Tweaked 'can_hold_items'. (#1674)
* Refactored 'IsAdvancedToolUser' into a macro plus relative trait. Tweaked 'can_hold_items'. (#54665)

The PR aims to allow advanced tool users to be defined by traits rather than a hardcoded proc.
Also necessary for the CanUseTopic refactor I'm working on, which will be PRed separately for atomization purposes.
This PR also fixes an inconsistency with can_hold_items (since monkeys can actually hold items).

* Refactored 'IsAdvancedToolUser' into a macro plus relative trait. Tweaked 'can_hold_items'.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-11-11 02:52:32 +00:00
SkyratBot
6b1da44c8a [MIRROR] Mob stays vertical while in cryo (#1639)
* Mob stays vertical while in cryo (#54800)

Currently, mobs in cryo will turn horizontal in the cryotube when they fall unconscious. This should stop that.

* Mob stays vertical while in cryo

Co-authored-by: prodirus <44090982+prodirus@users.noreply.github.com>
2020-11-09 08:42:53 +00:00
SkyratBot
9be3a7b8f6 [MIRROR] Moblity refactor: hands blocked and restrained edition. (#1051)
* Moblity refactor: hands blocked and restrained edition.

* Update carbon_defense.dm

* Update emotes.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-09-29 13:57:02 +02:00
SkyratBot
439207100a Adds Sign Language Quirk (#711)
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-09-09 08:43:01 +02:00
SkyratBot
e06a6da7ec [MIRROR] adds trait injector mapping helper (#708)
* adds trait injector mapping helper (#53473)

adds trait injector mapping helper and updates the traits_by_type list
thanks to anturk and mso

* adds trait injector mapping helper

Co-authored-by: Fikou <piotrbryla@onet.pl>
2020-09-09 08:18:51 +02:00
SkyratBot
676952afe0 [MIRROR] Dismemberment wound tweaks, zombies are easy to wound/dismember, tweaks to head vulnerability (#130)
* 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

* Dismemberment wound tweaks, zombies are easy to wound/dismember, tweaks to head vulnerability

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2020-07-31 00:22:04 +02: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