Commit Graph

1615 Commits

Author SHA1 Message Date
SkyratBot
7b71d77364 [MIRROR] Retires explosive lance crafting to a nice farm upstate where it has plenty of room to run around [MDB IGNORE] (#17461) 2022-11-14 14:33:06 -08:00
SkyratBot
b5bd312379 [MIRROR] Add investigate_deaths [MDB IGNORE] (#17424)
* Add investigate_deaths

* merge changes other than giant_spider which deps on tg/70848

* gib

* dust

* death

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-11-11 14:44:33 -05:00
SkyratBot
4b6c93f6b9 [MIRROR] Easy's Super Omega "unarmed strike based species var moved to limbs" refractor, unarmed strike striking with specific body parts rather than it just being flavor, and brain based attacking limb selection extra chunky edition. And also bodypart traits. [MDB IGNORE] (#17306)
* Easy's Super Omega  "unarmed strike based species var moved to limbs" refractor, unarmed strike striking with specific body parts rather than it just being flavor, and brain based attacking limb selection extra chunky edition. And also bodypart traits.

* Removed all the conflicts, and started converting all the arms and legs to the proper typepaths

* Actually makes the game compile :)

* Makes the maps compile too!

* Early mirror of #71143 because it's more relevant to us

Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-11-11 11:44:49 -05:00
Tastyfish
69df5a8320 [MISSED MIRROR] Giant Spider action fixes & Action feedback (#17439)
* missed mirror 70848

* SR modular
2022-11-11 06:42:28 -08:00
SkyratBot
6d30b8f94d [MIRROR] Bed war: add pillow weaponry and pillowman juggernaut suit [MDB IGNORE] (#17320)
* Bed war: add pillow weaponry and pillowman juggernaut suit (#69977)

* Add pillows you can hit someone you hate with it until they collaspe from exhaustion. The pillow can be made with cloth
* Adds a Pillow juggernaut suit, this suit allows you to automatically hit people with a pillow when you bump into them. It can be made from pillows and duct tape via the crafting menu
* Adds a bumpattack component, this can be added to any item and allows the user to auto attack on bump with a target, used for the juggernaut suit.
* Adds a Pillow hat an alternative to the paperbag hat, also made from duct tape and pillow. Very fashionable!
add: Clown/mime pillows
* The beds in dorm now come properly equipped with a pillow

* Bed war: add pillow weaponry and pillowman juggernaut suit

* repathed SR pillow to /obj/item/fancy_pillow

Co-authored-by: FinancialGoose <92416224+TheBoondock@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-11-10 16:51:54 -05:00
SkyratBot
9e9b09d90b [MIRROR] Chefs can now kiss food they make to make it with love. (And a lot of cooking refactoring) [MDB IGNORE] (#17334)
* Chefs can now kiss food they make to make it with love. (And a lot of cooking refactoring)

* update from master and fix conflicts

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-11-09 17:49:35 +00:00
SkyratBot
5942183f72 [MIRROR] [NO GBP] More balloon alerts for guns + fixes a wrong alert [MDB IGNORE] (#17415)
* [NO GBP] More balloon alerts for guns + fixes a wrong alert (#71136)

## About The Pull Request

Turns out I missed a few to_chats in #70398. Also I accidentally
inverted one so it said close the cover instead of open it. Oops!
## Why It's Good For The Game

Same reason as the original PR, balloon alerts are handy for stuff you
care about right now and not in 5 minutes. Also they should probably not
tell you to do the opposite of what you actually need to do.
## Changelog
🆑 VexingRaven
fix: Fixed a few balloon alerts for guns and moved a few more chat
messages to balloon alerts
/🆑

* [NO GBP] More balloon alerts for guns + fixes a wrong alert

* update modular

Co-authored-by: VexingRaven <msgerbs@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-11-09 14:53:23 +00:00
SkyratBot
71aa56d14c [MIRROR] concussive gauntlets now launch you away from gibtonite and mine basalt [MDB IGNORE] (#17417)
* concussive gauntlets now launch you away from gibtonite and mine basalt (#71108)

when you mine gibtonite using concussive gauntlets, you now get launched
away from it, so you wont get hit by the explosion
also lets them mine basalt for glass

* concussive gauntlets now launch you away from gibtonite and mine basalt

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
2022-11-09 02:05:50 +00:00
SkyratBot
39c08aa5d5 [MIRROR] V8 Engine fixes [MDB IGNORE] (#17401)
* V8 Engine fixes (#71033)

The V8 engine now allows you to learn the recipe and will no longer runtime when it checks if you already know it.

* V8 Engine fixes

Co-authored-by: lizardqueenlexi <105025397+lizardqueenlexi@users.noreply.github.com>
2022-11-06 16:44:34 -05:00
SkyratBot
f3faa38e1c [MIRROR] (hopefully) improvements to use of scope and kinesis module [MDB IGNORE] (#17302)
* (hopefully) improvements to use of scope and kinesis module (#70934)

## About The Pull Request
so, scope and kinesis are the only things in the game (other than the
body zone selector) which use the function MouseMove. this tracks every
mouse movement, which meant we had to stuff a cooldown on it to not
calculate a ton of useless stuff. this time can misalign if you move
your mouse fast, not registering at all, as well as not working out with
the 0.2 second processing time of the things handling it (the scope
component and kinesis module)
instead of doing that, we are now keeping the mouse parameters as a
variable, which we update with every mousemove to the current
parameters. then we handle the calculations right as we need them (in
the kinesis/scope) module, rather than relying on mousemove cooldowns,
this should hopefully feel way better

## Why It's Good For The Game
😁

## Changelog
🆑
qol: sniper scopes and kinesis module should feel better to use
/🆑

* (hopefully) improvements to use of scope and kinesis module

* seconds

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-11-04 12:55:05 -04:00
SkyratBot
3d12b40677 [MIRROR] Fixes a parallax runtime, prevents multiapplying parallax handlers [MDB IGNORE] (#17292) 2022-10-31 18:45:24 -07:00
SkyratBot
1261e956f1 [MIRROR] Adds a new black market item, the V8 Engine. [MDB IGNORE] (#17268)
* Adds a new black market item, the V8 Engine. (#70393)

This PR adds a new item to the black market uplink, the V8 Engine. The V8 engine is a classic, vintage engine, kept perserved for hundreds of years by black market smugglers, and they'll only ship it to you for an exceptional cost.

* Adds a new black market item, the V8 Engine.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2022-10-31 14:07:51 +00:00
SkyratBot
7df9d49165 [MIRROR] fixes being able to one-shot kill people by holding them up with a russian revolver [MDB IGNORE] (#17225)
* fixes being able to one-shot kill people by holding them up with a russian revolver (#70825)

* fixes being able to one-shot kill people by holding them up with a russian revolver

* fixes being able to one-shot kill people by holding them up with a russian revolver

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2022-10-29 07:20:07 -07:00
SkyratBot
170d3065b1 [MIRROR] Consciousness Transference potions tame creatures [MDB IGNORE] (#17220)
* Consciousness Transference potions tame creatures (#70782)

Consciousness Transference potions now send the COMSIG_SIMPLEMOB_TRANSFERPOTION signal. This is also used so the potion will tame the mob you transfer to, such as a xenobio-spawned chaos magicarp.

Fixes #70777

* Consciousness Transference potions tame creatures

Co-authored-by: Vladin Heir <44104681+VladinXXV@users.noreply.github.com>
2022-10-28 21:37:18 -04:00
SkyratBot
bdb951b7c0 [MIRROR] GAGs Buckets [MDB IGNORE] (#17213)
* GAGs Buckets

* Update code/datums/components/crafting/recipes.dm

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
2022-10-28 12:12:26 -07:00
SkyratBot
4c79b97104 [MIRROR] Refactors some signal misuse with the stationloving component [MDB IGNORE] (#17157)
* Refactors some signal misuse with the stationloving component (#70496)

* Refactors secluded locs

* Tweak

* Use traits instead of signals

* Review

* Type error

* Refactors some signal misuse with the stationloving component

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2022-10-25 14:13:46 -07:00
SkyratBot
07d722313f [MIRROR] Fixes runtime with the infective component on gibs [MDB IGNORE] (#17124)
* Fixes runtime with the infective component on gibs (#70706)

* Fixes runtime with the infective component. streak_diseases is a lazylist and is sometimes not instantiated.

* Lazynull

* Fixes runtime with the infective component on gibs

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2022-10-24 10:40:34 +01:00
SkyratBot
3c2b30b7d6 [MIRROR] Splattercasting, an offensive, sanguine equivalent to Lichdom. [MDB IGNORE] (#17076)
* Splattercasting, an offensive, sanguine equivalent to Lichdom. (#70637)

A spell similar to lichdom, though with different conditions.

Dramatically reduces your cooldowns
Cooldown saved is converted into blood lost
You are now a vampire, drinking blood refills your bloodwell, and you're naturally slowly running out.
New school, Sanguine spells, which aren't affected by splattercasting and generally involve blood.
Species change allowed by @ SuperNovaa41

* Splattercasting, an offensive, sanguine equivalent to Lichdom.

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2022-10-21 16:31:10 -04:00
SkyratBot
d7c5ab7987 [MIRROR] PKP Mind Virus: Glorfing Cigs edition [MDB IGNORE] (#16995)
* PKP Mind Virus: Glorfing Cigs edition

* conflicts

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-10-20 12:22:53 +01:00
SkyratBot
69487c6acc [MIRROR] Fixes directional light overlay leaking the lighting mask and not updating direction correctly [MDB IGNORE] (#17025)
* Fixes directional light overlay leaking the lighting mask and not updating direction correctly (#70578)

Fixes light direction/overlays when changing holder of light overlay

* Fixes directional light overlay leaking the lighting mask and not updating direction correctly

Co-authored-by: Tastyfish <crazychris32@gmail.com>
2022-10-20 01:25:57 -04:00
SkyratBot
612568daa0 [MIRROR] Swaps sleep() to use SECONDS define [MDB IGNORE] (#16973)
* Swaps sleep() to use SECONDS define

* merge conflicts and skyrat modules

Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-10-19 19:43:24 -04:00
SkyratBot
59dc5c36b7 [MIRROR] Cleans up the fallout from plane cube [MDB IGNORE] (#17003)
* Cleans up the fallout from plane cube (#70235)

* Cleans up the fallout from plane cube

Alright.
Makes cleaning bubbles respect planes
Adds support for updating overlays on move, fixing an issue with pointing at items
Adds better error messages for failing to provide args for mutable_appearance()
Fixes a bug where string overlays were not respecting insertion order

* Adds documentation for offset spokesman and offset_const

* Better stack trace

* Removes some redundant uses of cached MAs

At this scale, attempting to cache MAs like this has 0 impact on anything
And just makes things more messy then they need to be

* ensures fullscreen objects START offset, so things are always proper

* ensures chatmessages always have the right offset

* fixes compile

* whoops, the above lighting plane should actually be ABOVE the lighting plane

* fixes compile, also cleans up the fire overlay a tad

* Adds a unit test for plane masters that are shrunk by multiz being double shrunk

This is slightly hacky because of how I'm handing the plane master
group, but it's not THAT bad, and gives me some real good coverage

* Properly targets the seethrough plane at the game world plate. This fixes unit tests, and also just makes more sense

* whoops

* oh

* adds datum support for allocate(), cleans up a harddel from testing

* Makes camera chunks index at 1, and also makes them support non powers of two sizes, since that was unneeded

* fixes runtime in allocate

* Cleans up the fallout from plane cube

* liquid tweaks

* oop

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-10-19 19:43:05 -04:00
SkyratBot
5aa4d2b210 [MIRROR] Silver slime extract created food isn't toxic to jellypeople [MDB IGNORE] (#16975)
* Silver slime extract created food isn't toxic to jellypeople (#70424)

* Silver slime extract created food isn't toxic to jellypeople

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2022-10-19 11:29:09 +01:00
SkyratBot
6ff42bcc09 [MIRROR] Fixes runtime when exporting bounty cubes [MDB IGNORE] (#16891)
* Fixes runtime when exporting bounty cubes (#70535)

* Fixes runtime caused by trying to capitalize an object instead of its name, by making it now capitalize the name instead.

* Fixes runtime when exporting bounty cubes

Co-authored-by: GoblinBackwards <22856555+GoblinBackwards@users.noreply.github.com>
2022-10-16 12:54:36 +01:00
SkyratBot
080bdd8770 [MIRROR] Fixes shields inhands [MDB IGNORE] (#16791)
* Fixes shields inhands (#70395)

Fixes #70377

Stobe shield has been broken for.... hell I don't even know how long lmao

cl ShizCalev
fix: Fixed some missing shield inhand icons.
fix: The strobe shield's inhand icon now plays the flashing animation when triggered again.
fix: The strobe shield will no longer blind the person holding it when it deflects a blow.
fix: The light from the strobe shield's flash no longer appears in your held inventory slot.
fix: Fixed the east facing left-handed strobe shield sprite being misaligned by two pixels.
/cl

* Fixes shields inhands

* goliath shield

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-10-14 23:32:45 -04:00
SkyratBot
b7d978e580 [MIRROR] Carries over carded AIs into crafted intellicards [MDB IGNORE] (#16854)
* Carries over carded AIs into crafted intellicards (#70402)

* AIs that are crafted into Intellitater/Lantern is now moved into the new intellicard.
* Allows intellitaters/lanters to be crafted with intellicards that have an AI inside of them.

* Carries over carded AIs into crafted intellicards

Co-authored-by: GoblinBackwards <22856555+GoblinBackwards@users.noreply.github.com>
2022-10-14 15:41:41 -04:00
SkyratBot
68d1a1cec3 [MIRROR] Bileworm Health Patch: Evolutionary Leap, Vileworms, Proximity Spawning Rules, Better Loot [MDB IGNORE] (#16821)
* Bileworm Health Patch: Evolutionary Leap, Vileworms, Proximity Spawning Rules, Better Loot

* Feex

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-10-12 23:41:48 +01:00
SkyratBot
3bf620006b [MIRROR] Moves cleaning to an atom proc to afterattack signal [MDB IGNORE] (#16813)
* Moves cleaning to an atom proc to afterattack signal

* Fixing conflict!

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-10-12 14:49:04 -04:00
SkyratBot
3795ed1a6b [MIRROR] [MDB Ignore]Hats DMI split [MDB IGNORE] (#16693)
* [MDB Ignore]Hats DMI split

* e

* STAFE

* e

* e

Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-10-09 23:00:42 +01:00
SkyratBot
2847b2b37e [MIRROR] [ready] adds unit test for missing inhand icons. fixes a bunch of missing inhand icons [MDB IGNORE] (#16649)
* [ready] adds unit test for missing inhand icons. fixes a bunch of missing inhand icons

* cf

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-10-09 22:36:07 +01:00
SkyratBot
06469a6cb5 [MIRROR] Fixes lighting overlays from an item sometimes showing up on inventory slots / backpack slots instead of from the mob holding them. [MDB IGNORE] (#16720)
* Fixes lighting overlays from an item sometimes showing up on inventory slots / backpack slots instead of from the mob holding them. (#70250)

Fixes lighting overlays sometimes showing in inventory slots / backpack slots instead of the mob holding them

* Fixes lighting overlays from an item sometimes showing up on inventory slots / backpack slots instead of from the mob holding them.

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2022-10-08 18:21:25 -04:00
SkyratBot
ead1aa0b76 [MIRROR] TGUI for Techfabs II: The Great Recategorizing (AND ICONS) (AND MECHFABS) (AND AUTOLATHES) [MDB IGNORE] (#16616)
* TGUI for Techfabs II: The Great Recategorizing (AND ICONS) (AND MECHFABS) (AND AUTOLATHES)

* Still doesn't compile but there's no more conflicts

* [PR PR] Makes #16616 Compile And Work (#16656)

Oh hey, it compiles!

Co-authored-by: scriptis <scriptif@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: RimiNosha <106692773+RimiNosha@users.noreply.github.com>
2022-10-06 11:54:38 +01:00
SkyratBot
73ae6472a7 [MIRROR] NT Pay app. Money send on distance, transaction log! [MDB IGNORE] (#16672)
* NT Pay app. Money send on distance, transaction log! (#70108)

* base

* reasons

* GetToken proc, with a many remarks

* Add a way to change reason in transfer_money proc. Add a reasons.

* Reason to use the app. Commission. Standard application.

* Apply suggestions from code review - Tralezab

Co-authored-by: tralezab <40974010+tralezab@ users.noreply.github.com>

* Tralezab & jlsnow301 advices. New format(everywhere)

* Nanotrasen

* Refactor TGUI(not me:( ). Fix useless capitalize

* Update code/modules/economy/account.dm

* Trans transforms in transaction

* coMmission. little autodoc mistalke. Translation != Transaction

* oops

* Merge Conflict

* ...

* back feats

* mistakes bye!

* ну да

Co-authored-by: tralezab <40974010+tralezab@ users.noreply.github.com>

* NT Pay app. Money send on distance, transaction log!

Co-authored-by: Yaroslav Nurkov <78199449+AnywayFarus@users.noreply.github.com>
Co-authored-by: tralezab <40974010+tralezab@ users.noreply.github.com>
2022-10-05 19:38:36 -04:00
SkyratBot
9bf006d189 [MIRROR] Multiz Rework: Human Suffering Edition (Contains PLANE CUBE) [MDB IGNORE] (#16472)
* Multiz Rework: Human Suffering Edition (Contains PLANE CUBE)

* skyrat changes

* bodyparts merge

* unres door floorlight fix

* Future upstream fix for blindness

* upcoming upstream airlock fix

* fix button emissive

* Fix FOV markings?

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-10-02 23:30:09 -04:00
SkyratBot
1ce77983df [MIRROR] canUseTopic now uses TRUE/FALSE instead of defines that just say TRUE [MDB IGNORE] (#16586)
* canUseTopic now uses TRUE/FALSE instead of defines that just say TRUE

* etes

* eyes

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-10-02 15:54:46 +01:00
SkyratBot
32db6d2411 [MIRROR] Properly checks flags with & instead of == [MDB IGNORE] (#16487)
* Properly checks flags with & instead of ==

* merge fixed for changeling

* skyrat equipment updated

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
2022-09-28 16:38:59 -04:00
SkyratBot
1eab5a8364 [MIRROR] Heretics cannot be converted, and are immune to cult stun hands. Instead, the cult is rewarded for sacrificing them with the bloody bastard sword, an oversized SPIN2WIN funblade. + Soul Stealing Fantasy Affix [MDB IGNORE] (#16486)
* Heretics cannot be converted, and are immune to cult stun hands. Instead, the cult is rewarded for sacrificing them with the bloody bastard sword, an oversized SPIN2WIN funblade. + Soul Stealing Fantasy Affix (#69725)

About The Pull Request

Heretics can no longer be converted to a cult, as they follow their own Forgotten Gods.
Instead, Nar'Sie will reward the cult for managing to sacrifice one, with the bastard sword.
The bloody bastard sword has been cleaned up codewise and all that. Because it is a free reward instead of a (removed) progression mechanic of cult, it swings just a bit slower during the spin and doesn't have a jaunt. It's still a !fun! swinging sword of hilarity and death.
BLOODY BASTARD https://www.youtube.com/watch?v=ukznXQ3MgN0
Fantasy weapons can now roll "soul-stealing" weapons. They, on killing something, capture its soul inside the item.

    Add fail conditions that instantly end a spin2win, ala how

    Mimes can now hold a baguette like a sword by right clicking it #69592 works

Why It's Good For The Game

Bloody bastard sword was fun, it made no sense that heretics were valid converts when they're already worshipping a DIFFERENT evil god granting them powers. Should be in a good spot as a nice little antag to antag special interaction. I fucking love antag to antag special interactions, we should have more of 'em

Fantasy affixes are always a neat thing to throw a new component into
Changelog

cl
add: Heretics can no longer be converted to cult. But sacrificing them is very valuable to Nar'Sie, and she will grant special weapons if you manage to do so.
add: Fantasy affixes can also include soul-stealing items!
/cl

* Heretics cannot be converted, and are immune to cult stun hands. Instead, the cult is rewarded for sacrificing them with the bloody bastard sword, an oversized SPIN2WIN funblade. + Soul Stealing Fantasy Affix

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
2022-09-28 11:21:35 +01:00
SkyratBot
0e32be3c7d [MIRROR] Fixes weather sounds [MDB IGNORE] (#16467)
* Fixes weather sounds (#69944)

* Fixes weather sounds

Timber changed the args to this signal in cbc6f35f54, and didn't update my code.
Damn you timber.

Thanks to that bro in coderbus who told me about this

* Fixes weather sounds

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2022-09-27 16:44:26 -04:00
SkyratBot
eefbd40ce6 [MIRROR] Adds macros to help with common set_- and adjust_timed_status_effect uses [MDB IGNORE] (#16410)
* Adds macros to help with common `set_`- and `adjust_timed_status_effect` uses

* merge conflicts

* modular skyrat and missed changes

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-09-26 17:56:24 -04:00
SkyratBot
f9e3c6b23c [MIRROR] Moves signal overrride warnings to it's own log file [MDB IGNORE] (#16349)
* Moves signal overrride warnings to it's own log file

* Fixing conflict!

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-09-25 19:44:11 -04:00
SkyratBot
68e962fa21 [MIRROR] Adds seethrough component [MDB IGNORE] (#16421)
* Adds seethrough component (#69642)

Adds a seethrough component!
Standing behind a big object with this component will make the object transparent:

https://youtu.be/nnyWMJakVtE

And no one else can see it:

And yes you can click through it thanks to the power of plane masters!

Standing behind a tree is a pretty big meme and people will have to either shift right click or bump into you to ever find you. This makes it so much better to implement big objects, since they no longer obscure the tiles behind them
It's also useful for existing big objects, like billboards and the likes

🆑
qol: You can now see through big trees when you stand behind them!
refactor: Adds a seethrough component to make it easier to add big stationairy objects without reducing visibility
/🆑

Info

This is done by sending an override overlay to the user that obscures the normal object and plays an animation.

It registers an ENTERED signal on specific turfs. Those tiles in which it hides stuff is defined as a list of list coordinates, for which I made a global list with some defines. It's really crappy and I'd appreciate some feedback on that

* Adds seethrough component

Co-authored-by: Time-Green <timkoster1@hotmail.com>
2022-09-25 14:56:36 -07:00
SkyratBot
d27cd97f74 [MIRROR] [IDB IGNORE] [MDB IGNORE] Makes the icons/mob folder sane [MDB IGNORE] (#16030)
* [IDB IGNORE] [MDB IGNORE] Makes the icons/mob folder sane

* fix map merges

* icon paths and merge conflicts

Co-authored-by: skylord-a52 <skylord-a52@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-09-24 20:10:28 -04:00
MidoriWroth
15e4828e22 Teshari cultural food (#16138)
* Teshari cultural food

* reorganized some file paths

* made the jerky a little more appetizing

* removed unnecessary text from the teshari food define
2022-09-24 15:38:57 -04:00
SkyratBot
0bbc66b259 [MIRROR] Fixes FOV exploit with gasmasks [MDB IGNORE] (#16343)
* Fixes FOV exploit with gasmasks (#70017)

Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>

* Fixes FOV exploit with gasmasks

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>
2022-09-20 20:50:11 -07:00
SkyratBot
caf72b3bbb [MIRROR] Removes canuserrotate from simple rotation's screentip [MDB IGNORE] (#16333)
* Removes canuserrotate from simple rotation's screentip (#70002)

Removes canuserrotate from rotation context

Removes the check on whether the user can rotate a chair or not, in the screentip context message.
We shouldn't check to see if a person can or can't rotate a chair or not, they will instead get the feedback when they try to rotate it if they fail, but it's better if the screentip let them know it's a mechanic that exists.

* Removes canuserrotate from simple rotation's screentip

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2022-09-20 07:49:27 -07:00
SkyratBot
ea19c86793 [MIRROR] Fix plasma cutter or guns that burn not being able to ignite plasma [MDB IGNORE] (#16244)
* Fix plasma cutter or guns that burn not being able to ignite plasma

* Update plasma.dm

Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
2022-09-17 12:44:10 -07:00
SkyratBot
e68ee147f7 [MIRROR] Fixed USB ports not working [MDB IGNORE] (#16278)
* Fixed USB ports not working (#69920)

Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>

* Fixed USB ports not working

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>
2022-09-17 11:43:55 -07:00
SkyratBot
cb4f6915d9 [MIRROR] Fixes Bread Smite Causing Some Fucked Up Shit [MDB IGNORE] (#16254)
* Fixes Bread Smite Causing Some Fucked Up Shit (#69853)

* Fixes Bread Smite Causing Some Fucked Up Shit

Hey there,

So basically, when you had the bread smite done on you, you were _just_ added to the contents of the bread. Nothing more. That means that you could pick it up. You couldn't add it to your bag (it would always return back into your hand(?)), but it would create some weird oddities that was just cursed in general. Let's make it so you can't hold the container that you are contained within by giving you HANDS_BLOCKED.

* actually we don't need the named arg

lets get rid of the cursed thing entirely

* removes sanity check

* we do a bit of component trolling

THIS TOOK ME TWO HOURS FUCK YOU

* removes cruft comment

* cleans up code a teeny bit, upgrades to incapacitated

* wait that named arg is still there wtf

* Review Time

Co-authored-by: Seth Scherer <supernovaa41@ gmx.com>

* wrong operator and wrong order of operations

* null out the container

Co-authored-by: MrMelbert <51863163+MrMelbert@ users.noreply.github.com>

* checks to see if container is qdeld

* weakref time

Co-authored-by: Seth Scherer <supernovaa41@ gmx.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@ users.noreply.github.com>

* Fixes Bread Smite Causing Some Fucked Up Shit

Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: Seth Scherer <supernovaa41@ gmx.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@ users.noreply.github.com>
2022-09-15 11:32:16 -07:00
SkyratBot
ce6eab8ee2 [MIRROR] Add Alt RMB and Ctrl RMB screentips (used for Simple Rotation) [MDB IGNORE] (#16251)
* Add Alt RMB and Ctrl RMB screentips (used for Simple Rotation) (#69726)

* Add Alt RMB and Ctrl RMB to screentips

* Add Ctrl and Alt RMB screentips to defines

* Add Alt RMB and Ctrl RMB screentips (used for Simple Rotation)

Co-authored-by: Tim <timothymtorres@gmail.com>
2022-09-15 11:04:19 +01:00
SkyratBot
6c0a166a74 [MIRROR] Slightly rewords customizable reagent holder examine message [MDB IGNORE] (#16219)
* Slightly rewords customizable reagent holder examine message (#69880)

* Slightly rewords customizable reagent holder examine message

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2022-09-14 20:26:14 -07:00