Commit Graph

165 Commits

Author SHA1 Message Date
SkyratBot
3ec0199723 [MIRROR] Lets SAW tools (and PKC) cut trees, MINING tools break rocks, and fixes e-blades cutting while off [MDB IGNORE] (#14649)
* Lets SAW tools (and PKC) cut trees, MINING tools break rocks, and fixes e-blades cutting while off

* Fixing merge conflicts

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-07-01 01:30:39 +01:00
Useroth
81b8f962b7 Mirror 66967 & 67411 (#14279)
* Implements a Demolition Modifier variable to items, affects damage vs structures and robots. (#66967)

Adds a modifier variable which can be used to increase or decrease a given items damage to structures, machinery, vehicles, and robots (including cyborgs, simple-bots, and anything else with the MOB_ROBOTIC biotype)

* Fixes attacks on mech equipment ignoring armor / melee damage, also fixes mech equipment not being disabled at 0% health, also also unit tests mech armor (#67411)

Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2022-06-12 21:03:17 +01:00
SkyratBot
0a1f06a2d1 [MIRROR] This tail refactor turned into an organ refactor. Funny how that works. [MDB IGNORE] (#14017)
* This tail refactor turned into an organ refactor. Funny how that works.

* Firstly, fixing all the conflicts.

* Fixes all our maps (hopefully)

* Actually, this should fix pod people hair :)

* Almost everything is working, just two major things to fix

* Fixed a certain kind of external organ

* Cleaning up some more stuff

* Turned tail_cat into tail because why the fuck are they separate?

* Moved all the tails into tails.dmi because that was just dumb to have like 3 in a different file

* Adds relevant_layers to organs to help with rendering

* Makes stored_feature_id also check mutant_bodyparts

* Fixes the icon_state names of ALL the tails (pain)

* Fixes wagging, gotta refactor most mutant bodyparts later on

* I Love Added Failures

* Fixed some organs that slipped through my searches

* This could possibly fix the CI for this?

* It doesn't look like it did fix it

* This will make it pass, even if it's ugly as sin.

* Fixed Felinids having a weird ghost tail

* Fixes instances of snouts and tails not being properly colored

Co-authored-by: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-06-11 23:20:16 -04:00
SkyratBot
6bea86d98f [MIRROR] [MDB Ignore] Refactoring Flora code [MDB IGNORE] (#13651)
* [MDB Ignore] Refactoring Flora code

* update bushes

Co-authored-by: DragonTrance <dylan661993@gmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-05-20 16:01:51 +01:00
SkyratBot
133b753507 [MIRROR] Converts jittering to status effect, striking yet another mob level status value [MDB IGNORE] (#13534)
* Converts jittering to status effect, striking yet another mob level status value

* mmkay

* weh

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-05-11 21:59:42 +01:00
SkyratBot
3e4bad8694 [MIRROR] Confusion status effect is now duration based instead of magic number based [MDB IGNORE] (#13496)
* Confusion status effect is now duration based instead of magic number based

* e

* Update tgstation.dme

* Update contract.dm

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-05-11 01:52:39 +01:00
SkyratBot
a23c16c5aa [MIRROR] changes name of trait "STUNRESISTANCE" to trait "BATON_RESISTANCE", changes some descriptions [MDB IGNORE] (#13467)
* changes name of trait "STUNRESISTANCE" to trait "BATON_RESISTANCE", changes some descriptions  (#66788)

it will make a whole lot more sense when you look at the trait and see what it does, instead of assuming what it does based on its very clear name

* changes name of trait "STUNRESISTANCE" to trait "BATON_RESISTANCE", changes some descriptions

* Update cocaine.dm

Co-authored-by: private-tristan <54422837+private-tristan@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-05-10 01:44:43 +01:00
SkyratBot
66312868bc [MIRROR] Supermatter cascade round-end [MDB IGNORE] (#13436)
* Supermatter cascade round-end

* wew

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-05-09 01:23:07 +01:00
SkyratBot
044d75253c [MIRROR] Arconomy: The bigger balance PR (REVISED EDITION) [MDB IGNORE] (#13164)
* Arconomy: The bigger balance PR (REVISED EDITION)

* yes

* wew

* Update multitool.dm

* yers

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-04-27 21:29:22 +01:00
SkyratBot
62ddd77870 [MIRROR] Refactors speech impeding effects (drunken slurring / suttering) into status effects. Adds heretic slurring in addition to the existing cult slurring. Removes 4 vars from /living in return, which slightly optimizes Life() (wink) [MDB IGNORE] (#12770)
* Refactors speech impeding effects (drunken slurring / suttering) into status effects. Adds heretic slurring in addition to the existing cult slurring. Removes 4 vars from /living in return, which slightly optimizes Life() (wink)

* fex

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-04-19 18:54:12 +01:00
SkyratBot
17e4f6ad76 [MIRROR] Converts SFX keys into DEFINES [MDB IGNORE] (#11990)
* Converts SFX keys into DEFINES

* fixes and updates

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
Co-authored-by: John Doe <gamingskeleton3@gmail.com>
2022-03-11 16:43:39 -07:00
SkyratBot
8f058067c5 [MIRROR] Fixes bugs with batons with no cells [MDB IGNORE] (#11895)
* Fixes bugs with batons with no cells (#65042)

* Fixes bugs with batons with no cells

Co-authored-by: GoblinBackwards <22856555+GoblinBackwards@users.noreply.github.com>
2022-03-05 01:18:09 -05:00
SkyratBot
d1cfb4338e [MIRROR] Contextual screentips -- Screentips now show you what items/objects can do [MDB IGNORE] (#11529)
* Contextual screentips -- Screentips now show you what items/objects can do (#64502)

Adds the foundational system for contextual screentips, which will show you what you can do with objects/items, including through context, such as what you are holding.

Provides several helper elements for most use cases, and applies it to a handful of common objects in order to show the full breadth of the system.

Changes screentips preference from on/off to on/off/only with context. Players who originally had it on off will have it migrated to only with context, though can re-disable it.

* Contextual screentips -- Screentips now show you what items/objects can do

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2022-02-15 23:48:07 +00:00
SkyratBot
1f35afa6f6 [MIRROR] Fixes notice text resulting from someone batoning a cyborg [MDB IGNORE] (#11130)
* Fixes notice text resulting from someone batoning a cyborg (#64501)

* Fixes notice text resulting from someone batoning a cyborg

Co-authored-by: SMOSMOSMOSMOSMO <95004236+SmoSmoSmoSmok@users.noreply.github.com>
2022-01-29 23:09:20 -05:00
SkyratBot
c91e2d2430 [MIRROR] Make more use of <tool>_act [MDB IGNORE] (#10981)
* Make more use of <tool>_act

* conflicts

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
2022-01-25 17:51:36 -05:00
SkyratBot
35026d269f [MIRROR] Boomerang behavior is now defined as a component. [MDB IGNORE] (#10868)
* Boomerang behavior is now defined as a component. (#63949)

Fully refactors boomerang behavior to work as a component, so that a thrown boomerang will return back to it's thrower if within range. More than anything this modularizes the behavior for the backend,

* Boomerang behavior is now defined as a component.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2022-01-21 10:19:46 +00:00
RatFromTheJungle
558027e644 [NON MODULAR] Baton 'rebalance' (nerf) (#10665)
* 1

* Update department_guards.dm

* Update code/game/objects/items/melee/baton.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-01-18 01:16:07 +00:00
SkyratBot
647b408d01 [MIRROR] Fixes typos in span, other html elements [MDB IGNORE] (#10222)
* Fixes typos in span, other html elements (#63510)

Atomizes a much larger PR for another time...
There are typos in span and other html messages that causes them to not render correctly or at all.
Bug fixes
Converts those instances of span to use the macro

* Fixes typos in span, other html elements

Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
2021-12-23 17:18:43 +00:00
Tom
477217bc34 Fixes FTU 'Ignis' plasma sword (#9840) 2021-12-03 15:49:19 -05:00
SkyratBot
67e89df03c [MIRROR] Updates /code/game/objects/item/{melee,tcg}/* to follow the style guide [MDB IGNORE] (#9832)
* Updates /code/game/objects/item/{melee,tcg}/* to follow the style guide (#63130)

Co-authored-by: SuperNovaa41 <supernovaa41@ protonmail.com>

* Updates /code/game/objects/item/{melee,tcg}/* to follow the style guide

Co-authored-by: Seth Scherer <supernovaa41@gmx.com>
Co-authored-by: SuperNovaa41 <supernovaa41@ protonmail.com>
2021-12-02 22:23:31 +00:00
SkyratBot
8ca66e7bb2 [MIRROR] Stun Batong now turns off/on constantly for short time after emp [MDB IGNORE] (#9601)
* Stun Batong now turns off/on constantly for short time after emp (#62943)

About The Pull Request
title

Why It's Good For The Game
i dunno, seems funny it gives more depth or something allows for more intresting interactions

Changelog
🆑
expansion: Stun Batong now turns off/on constantly for short time after emp

* Stun Batong now turns off/on constantly for short time after emp

Co-authored-by: Colovorat <35225170+Colovorat@users.noreply.github.com>
2021-11-21 19:11:34 -05:00
SkyratBot
7f6712e121 [MIRROR] Gets Rid Of An Errant Space From The Baton Knockdown Message [MDB IGNORE] (#9520)
* Gets Rid Of An Errant Space From The Baton Knockdown Message (#62865)

* Gets Rid Of An Errant Space From The Baton Knockdown Message

Co-authored-by: Jackraxxus <60418544+Jackraxxus@users.noreply.github.com>
2021-11-17 20:31:49 +00:00
Iamgoofball
0679dd9b3d Returns the Knockdown to security batons. (#9146) 2021-11-09 06:45:48 -06:00
SkyratBot
b7b6bd501f [MIRROR] removes double spaces AFTER symbols [MDB IGNORE] (#9226)
* removes double spaces AFTER symbols

* Fixing conflicts

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-05 18:15:12 -04:00
SkyratBot
e90627be0e [MIRROR] Modernizing Radiation -- TL;DR: Radiation is now a status effect healed by tox healing, and contamination is removed [MDB IGNORE] (#9176)
* Modernizing Radiation -- TL;DR: Radiation is now a status effect healed by tox healing, and contamination is removed

* Fixing conflicts

* Makes it compile, yeet all the RAD armor from everywhere (thanks RegEx!)

* Removing more lingering rad armor (woo)

* Damnit powerarmors

* Bye bye rad collectors!

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-02 10:36:46 -04:00
Iamgoofball
fd577e0227 GoofSec: Departmental Guards, Stamina Crit Fixes, Armory Rework, 3-Hit-Stamcrit Batons, Flashbang fixes (#8524)
* GoofSec: Departmental Guards, Stamina Crit Fixes, Armory Rework, 3-Hit-Stamcrit Batons, Flashbang fixes

* More realism changes to the guns.

* "lmao lets just make bullets do double damage!!!!!"

* maint-fu properly restored

* fixes disabler desc

* sagwfwdqdqa

* Departmental Guard Drip + Fixing Guard Rolling Antags

* adds the trims for the guards

* haha yes i totally forgot the knockdown

* Brute damage hardlight bullets + map fixes!

* afwefqdqwd

* fixes security armor balance lmfao

* NICE FUCKIN MERGE CONFLICT

* Big Security Armor Rework + Fixing cell swapping issues

* Space Police!

* removes 2hand from the guns for now

* Fixes Guard antag rolling.

* Stamina crit filter is back!

* Fixed vendors, 911 overhaul, Re-added sec crates to cargo

* whoops haha

* afwvwsadcwaed

* efWEFwedqadq

* bank error, you have been rewarded 20 thousand credits

Co-authored-by: Funce <funce.973@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-26 17:17:20 +01:00
SkyratBot
bb2e3a962c [MIRROR] Remove cattleprod from suit storage slots [MDB IGNORE] (#8998)
* cattleprod weight class (#62254)

* Remove cattleprod from suit storage slots

Co-authored-by: Mooshimi <85910816+Mooshimi@users.noreply.github.com>
2021-10-23 14:17:41 -04:00
SkyratBot
19a8384360 [MIRROR] Makes the American sausage a sausage subtype & Advanced roasting stick fixes [MDB IGNORE] (#8949)
* Makes the American sausage a sausage subtype & Advanced roasting stick fixes (#62193)

Makes the American sausage a proper subtype of sausage, which makes it actually edible, apparently. It also makes it stick on the advanced roasting stick!
The advanced roasting stick will no longer try to grill itself over a bonfire with a griddle installed, allowing you to use the actual bonfire for your roasting needs.

There was actually a check that was supposed to limit the amount of times you could roast a sausage to a measly 1. It wasn't actually working. This PR removes that in favor of mad cooks creating these:

* Makes the American sausage a sausage subtype & Advanced roasting stick fixes

* fixes

Co-authored-by: Sealed101 <75863639+Sealed101@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
2021-10-23 00:23:39 +01:00
SkyratBot
c23bd1cb8c [MIRROR] every case of initialize that should have mapload, does (#8374)
* every case of initialize that should have mapload, does

* E

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-24 23:07:53 +01:00
Gandalf
bf1cfcdc7a Fixes soemthing bad 2021-09-24 21:33:37 +01:00
SkyratBot
349325050b [MIRROR] Fixes stun-harmbatonging (#8292)
* Fixes stun-harmbatong. (#61418)

Title. I have been told the refactor broke stun'n'harm batoning for stunbatons so I'm fixing it.

* Fixes stun-harmbatonging

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-09-20 23:20:31 +01:00
SkyratBot
26f934c258 [MIRROR] Baton refactor. item/melee/baton is now a subtype of item/melee/baton (formerly classic_baton) (#8076)
* Baton refactor. item/melee/baton is now a subtype of item/melee/baton (formerly classic_baton)

* EEEE

* E

* follow the fucking guidelines

* E

* Update CentCom_skyrat.dmm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-13 23:27:01 +01:00
SkyratBot
5feca8a1be [MIRROR] Replaces MATERIAL_NO_EFFECTS with MATERIAL_EFFECTS. (#7966)
* Replaces MATERIAL_NO_EFFECTS with MATERIAL_EFFECTS. (#61166)

* Replaces MATERIAL_NO_EFFECTS with MATERIAL_EFFECTS.

* build warning and codermonky's advice.

* Replaces MATERIAL_NO_EFFECTS with MATERIAL_EFFECTS.

* skyrat fixes

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
2021-09-06 08:30:35 -04:00
SkyratBot
f76747d3cc span fixes (#60936) (#7686)
Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2021-08-21 22:14:57 +01:00
Seris02
f3585b55a6 [NON-MODULAR] fixes things so that classic (including peacekeeper) batons can stamcrit again (#6995)
* IT CAN STAMCRIT AGAIN WOO

* adds a skyrat comment
2021-08-03 21:45:20 +01:00
SkyratBot
92537c9856 [MIRROR] Fixes perspective issue with classic baton (#7291)
* Fixes perspective issue with classic baton (#60517)

* Fixes perspective issue with classic baton

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2021-08-01 11:42:20 +01:00
SkyratBot
c6ee89d898 [MIRROR] contractor baton cyborg stunning now uses left/right clicks, not combat mode (#6427)
* contractor baton cyborg stunning now uses left/right clicks, not combat mode

* Update misc.dm

* Update misc.dm

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-22 01:02:29 +01:00
SkyratBot
7d1d0e1fad [MIRROR] Refactors most spans into span procs (#6315)
* Refactors most spans into span procs

* AA

* a

* AAAAAAAAAAAAAAAAAAAAAA

* Update species.dm

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-16 00:24:49 +01:00
SkyratBot
6f3b151bb8 [MIRROR] Fixes a bunch of harddels that are sourced from player action (#6252)
* Fixes a bunch of harddels that are sourced from player action

* Mirror!

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-11 03:13:33 +01:00
SkyratBot
4914ae5ae1 [MIRROR] Datum mat GAGS support and mace migration (#6059)
* Datum mat GAGS support and mace migration

* Mirror!

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-01 15:49:32 +12:00
SkyratBot
9e71c36830 [MIRROR] Nanotransen Legal Liability Initiative - Weapon Stats but more RP (#5874)
* Nanotransen Legal Liability Initiative - Weapon Stats but more RP (#58865)

* Weapon Descriptions (And Also Reversion)

Adds support for weapon statistics to be shown as part of examining an item, similar to the tags found on armor. Also, reverts the small changes I made on master because I'm a fucking idiot and made those changes on master.

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

* Nanotransen Legal Liability Initiative - Weapon Stats but more RP

Co-authored-by: Beatrice <83368538+SpaceDragon00@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-05-23 15:04:50 +01:00
Gandalf
641ab80135 Nightstick batong upgrade + stunsticks(in cargo) (#4403)
* Now that batongs have been debatonged it's time to rebatong the new batong

* aaa

* aaaaaaaaaaa

* Update packs.dm

* RMOV BANTONG

* Update peacekeeper_baton.dm

* Update peacekeeper_baton.dm

* Update peacekeeper_items.dmi
2021-03-28 23:31:13 +01:00
SkyratBot
9ffdf58259 [MIRROR] Some explosions code cleanup (#4276)
* Some explosions code cleanup (#57493)

Clears out two deprecated explosions systems (explosion ids and explosion levels)
Refactors a bunch of contents_explosions procs to be maybe slightly faster.
Cleans up a bunch of ex_act code.
Slightly cleaner code
A few less unused vars on /atom and /turf

* Some explosions code cleanup

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-03-21 01:03:36 +00:00
gonenoculer5
eb803c7c65 Adjusts skyrat nerf to Contractor Batons (#3758)
Makes contractor batons useful again by reverting the damage to something closer to the original damage so that it remains an effective tool.
2021-03-02 19:17:10 +00:00
SkyratBot
18eca27569 [MIRROR] update_appearance (#3508)
* update_appearance

* a

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-19 16:08:09 +00:00
SkyratBot
43febe3145 [MIRROR] Converts many proc overrides to properly use list/modifiers, lots of other smaller things (#3433)
* Converts many proc overrides to properly use list/modifiers, lots of other smaller things

* Update human_defense.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-17 14:18:21 +00:00
SkyratBot
495b35a679 [MIRROR] Converts all uses of modifiers to lazy access to avoid memes in future (#3331)
* Converts all uses of modifiers to lazy access to avoid memes in future

* Update work_tools.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
2021-02-13 11:06:39 +00:00
MLGTASTICa
c344beff58 Adds special descs to chameleon items , energy swords(toy and real) , chameleon projector , implanters. (#3136)
* the descs

* Update chameleonproj.dm

* Update dualsaber.dm

* Update implant_misc.dm

* Update energy.dm

* Update toys.dm

* Update toys.dm

* Update chameleon.dm

* Update pen.dm

* grammar

* Update implantuplink.dm

* Update implant_stealth.dm

* Update energy.dm

* Update chameleon.dm

* Update pen.dm

Co-authored-by: MLGTASTICa <ak9bc01d@yahoo.com>
2021-02-06 14:46:43 +00:00
SkyratBot
dd4a146f90 removes the test-merge only code from the combat mode commit (#3064)
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 21:05:21 +00:00
SkyratBot
e890b1282b [MIRROR] Replaces intents with combat mode (#3063)
* Replaces intents with combat mode

* updates

* a

* Update living_defense.dm

* https://github.com/tgstation/tgstation/pull/56638/files

* gunsafety!

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 16:58:16 +01:00