Commit Graph

63 Commits

Author SHA1 Message Date
SkyratBot
c98c1ee77b [MIRROR] Fixes crafting duplication bug/runtime and attempts to address destroying items in consumed containers (#1270)
* Fixes crafting duplication bug/runtime and attempts to address destroying items in consumed containers

* Update global_lists.dm

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-10-13 02:15:26 +02:00
SkyratBot
98568e191a [MIRROR] Enforce preserving parent proc return values across ui_act call stacks (#999)
* Enforce preserving parent proc return values across ui_act call stacks (#53964)

All ui_act procs should call parent by default. All procs should preserve the value of the parent proc when it's TRUTHY and pass it down the call stack. No UI should be interactible when its flags or state indicate it should not be, except when explicity overriden by child procs intentionally disregarding parent return values to achieve a specific goal.

* Enforce preserving parent proc return values across ui_act call stacks

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-09-26 17:17:59 +02:00
SkyratBot
160c64b485 [MIRROR] Remove bad reference from atmos (#852)
* Remove bad reference from atmos (#53781)

Change the name from Cyrion B to Zauker due to the easy connection the bad groups in the past

Not getting a repo ban is good

* Remove bad reference from atmos

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2020-09-18 00:36:50 +01:00
SkyratBot
2595f10911 [MIRROR] Fixes some issues with sign language & makes some things more clear (#783)
* Fixes some issues with sign language & makes some things more clear (#53610)

Changes the name of the recipe for the gloves to make them more clear
Adds a note in the tongue file to make sure it's clear you SHOULDN'T SEE THAT TONGUE.
Adds a unique chat message for mimes who use sign language, to make it clearer you can't cheese as a mime
Adds a unique slurring verb for drunkards
Removes the ability for sign languagers to use megaphones, which I forgot existed in the game. 
Punctuation removal now replaces all punctuation used with periods rather than with blank space, to reduce run-on sentences.

* Fixes some issues with sign language & makes some things more clear

Co-authored-by: Wallemations <66052067+Wallemations@users.noreply.github.com>
2020-09-13 04:39:19 +02:00
SkyratBot
d09940bcac [MIRROR] Adds rollerskates, wheely can do tricks (#751)
* Adds rollerskates, wheely can do tricks (#53497)

This turns wheelys into a skateboard subtype so they are no longer a copy paste of old skateboard code. They have lower stability compared to skateboards.
I've also made a whole bunch of small adjustments in the process to make skateboard code cleaner and more modular, such as turning the improvised skateboard to its own subtype so that construction steps don't need to be overwritten for all subtypes

Adds two subtypes of wheelys:
-Rollerskates: more stable than wheelys but slow you down when the wheels are retracted
-Skishoes: For skiing! Only work on snow, obviously

I wanted to add some fun alternatives to skateboards with their own drawbacks, and the ski shoes were an opportunity to do something fun for icemoon maps

* Adds rollerskates, wheely can do tricks

Co-authored-by: Mickyan <38563876+Mickyan@users.noreply.github.com>
2020-09-11 23:18:39 +02:00
SkyratBot
5504cc9b36 [MIRROR] Add 5 new gases, related interactions/items/content, changes parts of fusion (#736)
* Merge pull request #53013 from Ghilker/reactions-go-BRRRR

The scope of this PR is to add new and interesting stuff to the atmos crew and to bring more people to it both old and new.
This PR adds 5 new gases, a bunch of reactions (i'm still working on this but suggestions are useful), new recipes and items to the atmosians arsenal. These gases have high utility for everyone, atmosians will find them useful to do their job both as firefighters and air maintenance.
FINAL GAS NAMES (will change only if a maintainer ask about it)

Healium
Proto Nitrate
Cyrion B
Halon
Hexane

reactions avaiable in this PR: https://drive.google.com/file/d/1e6DZlBaKSCNdCADKnrH3F3aDWvl0iZr4/view

What the PR add:
-Healium: a red gas, stronger than n2o if breathed, with healing properties
-Proto Nitrate: a green inert gas if breathed but with different reactions with various gases at high temperatures
-Cyrion B: a black deadly gas if breathed that decompones very fast if exposed to N2 even at minimal amounts
-Halon: a light blue gas that when used in a fire it will suck up the O2 and will help cool the room, helping fighting the fire
-Hexane: a purple gas that has the ability to filter from the air plasma and n2o, useful to clean distro from the harmful gases quickly
-Healium Crystal: a reddish crystal that when broken will explode cooling the room and removing the plasma from the air (act like a grenade)
-Proto Nitrate Crystal: a greenish crystal that when broken will explode refilling a space with O2 and N2
-Cyrion B Crystal: a blackish crystal that when broken will explode dealing damage around it
-Metallic hydrogen recipe addition (atmosian armor and fireaxe)
-Statue of an elder atmosian (for bragging rights)
-Supermatter Interactions
-More gas interactions (Roinnel have multiple and different interactions)
-New RPD device: the pressure valve, a device that allow gas flow in a pipenet if the input pressure is higher than the set pressure it's getting atomized
-Fusion is a bit "easier" to start (minor changes to the math so that the instability is more reasonable)
-pluox can be also made without using rads
-cyrion-b bounty
-all 5 gases can be sold to cargo

More stuff needs to be added (like the SM interactions(added) and probably more reactions and breathe reactions)
Please leave suggestions and feedbacks as it helps improve the PR

Atmos desperately need more content and need to be proactive in the making of its tools, with this PR is a start to more atmos content

🆑
add: hydrogen + rads = trit
add: 5 new gases
add: Healium : made from Bz + Freon + cold, it knocks people down but have healing properties
add: Proto Nitrate : made from pluox and H2 + heat, it has different reaction with a bunch of other gases
add: Cyrion B : made from hypernoblium + stimulum around 0°C, it has heavy damage if breathed but is decomposed rapidly by N2
add: Halon : made from bz + trit + cold, it reacts with O2 at high temperature removing it and cooling the air, helping putting out fires
add: Hexane : made from bz + H2 + cold, it reacts with plasma and n2o and removes them from the air mix, filtering them.
tweak: stimulum no longer require plasma
add: canister sprites, gas sprites
add: crystal from gases formation and reaction
add: new metallic hydrogen recipes
add: elder atmosian statue
add: supermatter interactions
tweak: minor changes to fusion math to make it "easier" to start
add : pluoxium can be also made without using rads (not removing the rad production one) (this also produces a minimal amount of h2)
tweak: lowered hypernoblium min temperature of reaction
tweak: metallic hydrogen production more common
add: cyrion-b bounty
add: all 5 gases are up to selling
/🆑

* Add 5 new gases, related interactions/items/content, changes parts of fusion

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2020-09-11 23:02:34 +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
fb3d8baf27 [MIRROR] [Ready] Wedding Content! Crate with tuxedo, wedding dress, cummerbund, veil, and craftable bouquets (#534)
* [Ready] Wedding Content! Crate with tuxedo, wedding dress, cummerbund, veil, and craftable bouquets (#52733)

Adds wedding content.

* [Ready] Wedding Content! Crate with tuxedo, wedding dress, cummerbund, veil, and craftable bouquets

Co-authored-by: OnlineGirlfriend <50865623+OnlineGirlfriend@users.noreply.github.com>
2020-08-27 03:08:55 +02:00
SkyratBot
e65a48e91f [MIRROR] Adds SIGNAL_HANDLER and SIGNAL_HANDLER_DOES_SLEEP to prevent signal callbacks from blocking (#430)
* Adds SIGNAL_HANDLER and SIGNAL_HANDLER_DOES_SLEEP to prevent signal callbacks from blocking (#52761)

Adds SIGNAL_HANDLER, a macro that sets SHOULD_NOT_SLEEP(TRUE). This should ideally be required on all new signal callbacks.

Adds BLOCKING_SIGNAL_HANDLER, a macro that does nothing except symbolize "this is an older signal that didn't necessitate a code rewrite". It should not be allowed for new work.

This comes from discussion around #52735, which yields by calling input, and (though it sets the return type beforehand) will not properly return the flag to prevent attack from slapping.

To fix 60% of the yielding cases, WrapAdminProcCall no longer waits for another admin's proc call to finish. I'm not an admin, so I don't know how many behinds this has saved, but if this is problematic for admins I can just make it so that it lets you do it anyway. I'm not sure what the point of this babysitting was anyway.

Requested by @optimumtact.
Changelog

cl
admin: Calling a proc while another admin is calling one will no longer wait for the first to finish. You will simply just have to call it again.
/cl

* Adds SIGNAL_HANDLER and SIGNAL_HANDLER_DOES_SLEEP to prevent signal callbacks from blocking

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-08-19 20:17:28 -04:00
SkyratBot
d2778728a5 [MIRROR] Removes "availible" mispellings in codebase (#427)
* Removes "availible" mispellings in codebase (#53046)

* AVAILABLE

* Rebuild tgui

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>

* Removes "availible" mispellings in codebase

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-08-19 20:14:11 -04:00
SkyratBot
2409f77637 [MIRROR] you can now make extendohands with a right and left arm (#294)
* you can now make extendohands with a right and left arm (#52826)

* you can now make extendohands with a right and left arm

Co-authored-by: Fikou <piotrbryla@onet.pl>
2020-08-12 11:26:32 +01:00
SkyratBot
f9a2fc2495 [MIRROR] Blacklist fix for self crafting (#253)
* Blacklist fix for self crafting  (#52804)

* First fix

* Ugggh

* Blacklist fix for self crafting

Co-authored-by: WarlockD <warlockd@gmail.com>
2020-08-10 17:30:40 +01:00
AnturK
1f5e905c0d Simple skill/skillchip framework (#52314)
* Simple skills framework.

* Map changes.

* Adds skillchips to vendor

* Adds skill stations to the map.

* Circuitboards

* Fix typo

* Some minimal instability

* Fixes,tweaks etc

* Suggest better names or we'll end up with these.

* sharpness thing

* tgui build

* Makes wine from booze synthetizer show to wine tasters.

* Makes wine from dispenser have taste for wine tasters.

* Apply suggestions from code review

Co-authored-by: Rohesie <rohesie@gmail.com>

* Swaps to carbon var.

* wordy helper proc

* While i'm at it, other relaymoves

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-29 04:14:10 -04:00
Aleksej Komarov
0cf00a2645 tgui 4.0 (#52085)
* tgui 4.0 hyper squash

* Upgrade dependencies
2020-07-16 20:13:04 +02:00
nemvar
b87f65d95e Converts ALL typepaths to lowercase (#51642)
* Case of lower

* More changes

* Ruins the nice 420 diff, brainfart when doing the second batch of conversions

* More changes

* Next batch. I think

* Converts even more paths

* Restarts bots

* Capital Free Zone

* Come on travis, do something

* Renames areas

* Bots, please stop dying

* Updates CONTRIBUTING.md and updates a few paths I missed.

* APC recgarftzfvas
/obj/item/computer_hardware/recharger/apc to /obj/item/computer_hardware/recharger/apc_recharger
2020-06-17 20:47:57 -03:00
spessman-007
ab84042f94 [READY] Improve spelling (#51134)
* Improve spelling

* Spell isn't, ain't, shouldn't, hasn't, wasn't correctly

Co-authored-by: NewSta <spessman-007@users.noreply.github.com>
2020-05-25 02:13:37 +08:00
Fikou
0d4812a840 Fix science glasses removal recipe (#51211)
It used beer goggles instead of science goggles. Now it uses science 
goggles.
2020-05-23 23:45:32 -07:00
Fikou
4230492e77 adds the improvised pickaxe (#50534) 2020-04-23 18:47:48 -03:00
actioninja
b5dfd8880d id to component name 2020-04-19 19:36:35 +03:00
necromanceranne
09831566b2 Bags of Holding: Rarity Edition (#50290)
* Bags of holding require a bluespace anomaly to create.

* now it uses a recipe aw ye
2020-04-06 15:58:47 -04:00
Mickyan
218dc6f6af crafting 2020-04-05 15:36:39 +02: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
nightred
15452cac44 [READY] Two Handed Component (#49422)
About The Pull Request

For an item to be two handed just add this handy component.

All existing two handed items have been converted to use this component.
Why It's Good For The Game

It has components and signals, and now you can make items two handed so simply.

/obj/item/shockpaddles/ComponentInitialize()
	. = ..()
	AddComponent(/datum/component/two_handed)
2020-03-04 11:26:01 +13:00
TheVekter
572be45c12 Adds the Vibebot (#49251)
* Adds the Vibebot and associated files

* Refactored code

* Further code fixes

* Fixed UI issue

* See last commit

* god why

* Fixed bug related to color priority
2020-02-18 08:25:02 +01:00
AnturK
e40e22da6b Another runtime fixes batch. (#49209)
* Slime gland runtime fix.

* Logout ahelp logging runtime.

* Crafting non-items runtime.

* Turret building runtime.

* spacevine runtime.

* forcesay runtime fix.

* One less var
2020-02-10 10:50:36 -05:00
Fikou
8deeceefb6 [READY] Adds rideable Goliaths (#49003)
* adds rideable goliaths

* stamding on the emdge

* plems work

* this should be it

* FUCK YOU TRAVIS

* primal friendly

* ok athath buddy

* mmm grayons

* sprite gang

* placeholder sprite, works till someone makes a new one maybe haha

* lets do this

* An object tames a monstrous beast somehow. More news at 5.
2020-02-07 17:00:07 +01:00
ma44
a338b0a584 Refactors the crafting component (#48765)
About The Pull Request

Allows the crafting component to not be limited to just mobs but also able to be put on just about any atom, in addition it also gives a bit more settings to play around with like increasing the range of the ingredients search or choosing what to do with an item before it's placed anywhere.
Why It's Good For The Game

Enables greater functionality and may be a precursor PR before implementing automatic crafting machinery as this PR would allow machines to be able to do such a thing.
Changelog

🆑 ma44
refactor: Crafting has now been refactored and allows non mobs to have the ability to craft, at least that's what would come out of it if someone further developed the idea.
/🆑
2020-01-29 11:44:21 +13:00
ArcaneMusic
b62d105228 Adds the Wood Datum Material, giving it to items made from wood. (#48820)
* Initial commit, wood datum mat. Works on my machine.

* Wait this makes baseball bats worthless nevermind

* Review changes, uses the define now, just don't know how bitflags work well enough for that other bit

* Adds the material dependance check

* FINE
2020-01-23 17:36:10 -05:00
Flint
c7e7e2ac97 The separation 2020-01-21 16:48:31 -06:00
skoglol
1986466aa7 Fix converting riot shield subtypes to strobe shields (#48541)
Basically this would let you upgrade fake roman bucklers to fully 
fledged riot shields with a flash on them.

Also fixed some inconsistent list indentation.
2020-01-04 22:25:38 -08:00
swindly
ee056e6cba fixes check_contents blacklist check (#48520) 2020-01-02 14:53:09 -05:00
ShizCalev
9f532650b3 Pin removal recipe turned into proper tool_act. Has examine message informing you that you can do the thing. Now plays proper tool sounds. (#48461)
* Pin removal recipe turned into proper tool_act. Has examine message informing you that you can do the thing. Now plays proper tool sounds.

* fixed message
2019-12-31 09:18:33 -05:00
Jordan Brown
6d50877333 Fix crafting (#48477)
Initializes the instance type list before attempting to add to it.
2019-12-31 11:53:32 +01:00
Jordan Brown
bed37b7bb2 Fixes Intellitater crafting deleting AIs (#48451)
* Adds safety requirement checking to crafting

/datum/crafting_recipe now has check_requirements() which will be called once item instances that will be used are collected. If this fails, the crafting will be aborted.

* Prevent populated AI cards from use in crafting.

- Overrides check_requirements for the aitater crafting_recipe, failing it if there is an AI present in the candidate card.
2019-12-29 13:20:45 -05:00
swindly
0e2b4e1977 Adds logs as parts of bonfires and blacklists steel-caps from them (#48312)
* blacklists steel logs from bonfire

* adds logs as bonfire part
2019-12-21 16:43:36 +01:00
swindly
659778d115 Adds blacklist check for using crafting ingredients (#48311)
* adds blacklist check for craft ingredients

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

Co-Authored-By: Jordan Brown <Cyberboss@users.noreply.github.com>

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2019-12-21 16:40:59 +01:00
Jordie
2f440e4b21 Merge pull request #48044 from bluetshirtguy/SinewSkirtkilt
A watcher sinew Skirt/MANLY KILT accessory
2019-11-30 18:43:17 +11:00
skoglol
61e01d3ac0 Crafting recipe results blacklisted by default (#47852)
* Strobe shield cant be crafted from strobe shield

* Blacklists result by default.

* Doesnt blacklist reqs
2019-11-28 19:12:15 +01:00
cybersaber101
4de97787b1 Added A watcher sinew Skirt accesory
A kilt designed out of monster bits, pretty hardcore right?
It has the same protection as the other tribal accessories. crafted using 2 watcher sinew and one bones. Will show over any clothing or suit.
2019-11-28 00:23:20 -08:00
Emmett Gaines
5481515dff Removes the non bitflag slot defines (#47742)
Removes the non bitflag slot defines
2019-11-17 17:52:11 -08:00
Krysonism
738b4fcae7 Da bottle update. Empty glass bottles, bottle crafting, hooch & moonshine bottles. (#47696)
* bottle bottle bottle

* newline
2019-11-12 17:54:49 -05:00
Rob Bailey
220a894d21 crafting fix (#47730) 2019-11-12 17:18:20 +01:00
Rob Bailey
4477fb387b Language and Crafting tgui-next (#47474)
* Crafting + Language Menu

crafting menu work start

personal crafting menu

rebuild

early return cleanup

remove a debug print

minor refactors

rebuil

* Crafting + Language Menu

crafting menu work start

personal crafting menu

rebuild

early return cleanup

remove a debug print

minor refactors

rebuil

* Unfuck crew console

* import cleanup

* one more
2019-11-02 19:52:17 -04:00
ArcaneMusic
f796acbaf8 Adds a new Lavaland Ruin, the Elephant Graveyard (#47325)
* Initial Commit, Features the Map, Map specific files, changes to a metric ton of icons, etc.

* Fixes merge conflict, actually adds the map

* Spelling is hard Part 1

* Alright, steps are bad. Got it.

* Clean slate, please pretend to compile

* dme issue

* Fixes it for lavaland elites PR

* Removes the last dirty step_x, removes duplicate file, makes treavor happy

* Fixes some newline issues.

* Fixes some types, spawns skeletons in select graves since mob_spawns kept shoving them outside.

* Makes bone statues and shovel actually craftable, cleans up some comments.

* Properly defines muddy paper, updates map, fixes a few more typos.

* Prevents some future turf atmos issues, finally touched up the two skull sprites.

* Refactors strong mineral drops, cleans up some duplicate code, prevents washing hands with OIL

* I swear officer, i'm a native english speaker, fixes remains dropping correctly, un-nests my Ifs further.

* Oil well now covers target in oil when interacting with it.

* Refactors sink deconstruction a bit, oil wells can't be constructed with a wrench.

* Cleans up some atmos, and adds a return

* Adds subtype of remains for use in graves, move their spawn to src, not loc

* Moves around remains spawn, gets rid of untouched var
2019-10-26 21:41:43 +02:00
Time-Green
bca59b9a50 [READY] Plumbing: Endgame (#46759)
cl
add: Plumbing equipment is now available through the medical protolathe. It's under medical machinery boards
add: Add's a new chemistry area on metastation for chemical factories. It's located left of main surgery.
tweak: Chemistry has been turned into the Apothecary. It's basically normal chemistry, but Medical Doctors have acces aswell.
tweak: The smoke machine is now plumbing compatible. Put this knowledge to good use.
sprite: Thanks to @CRITAWAKETS for the plumbing RCD sprite!
/cl

Finally adds plumbing to the game!

Chemistry has been turned into the apothecary. For all intents and purposes it's old chem, but doctors have acces.

West of main surgery is now the new chemistry factory area.

I've also had to move stuff around alot, because you can't just add a big new room without having stuff in the way.

Currently only on metastation. I'm completely drained from adding it to meta alone and doing all maps right now will burn me out.
2019-10-17 00:10:30 +13:00
William Wallace
4f8b437069 'frozen' food crafting category now works (#46970)
* ice crafting category now works

* un-murder rainbow snowcone
2019-10-11 15:46:45 -04:00
bgare89
d89aba95d5 Fixes #46440 (#46661)
Also transfers old spears damage to new explosive spear. (Fixes plasma spears.)
2019-09-23 14:06:35 -07:00
Fikou
a439c6ac37 makes the ed209 a child of securitrons instead of a horrifying copypaste (#46230)
About The Pull Request

does what says on title, becomes a securitron that can shoot people
removes ed209 cell because it doesnt do anything why does it even exist
fixes ed209 crafting using dragnets
sadly, removes lasertag mode from ed209, but ive never seen anyone use it and it made everything a lot more confusing
eds now shoot you even if youre lying down because i guess that you could rest before to avoid getting shot but im not 100% sure
Why It's Good For The Game

fixes tons of horrifying copypaste
also fixes some minor things
Changelog

cl
del: Lasertag EDs have been removed
code: EDs are now not a horrifying mess of copypasted securitron code
balance: EDs now still shoot you if you're lying down
tweak: you no longer need a battery to make an ed209
fix: fixes ed209 crafting using dragnets instead of disablers
/cl
2019-09-16 16:33:19 +12:00
Fikou
259ebdcc5d makes bonespear a child of spear and MAKES THE DAMAGE MORE CONSISTENT (#46467)
* who did this

* boner

* a

* a

* hhhhhhhhhhhhhhhhhhhhh

* a

* a

* Update recipes.dm

* hhhh
2019-09-13 18:36:10 -04:00
TheChosenEvilOne
2d93a013d6 Motorized wheelchairs (#45737)
* Motorized wheelchairs

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* bruh

* woah

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Upped the power usage to 100.
With 15000 power cell you can move 600 turfs with tier 4.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Assign the variables directly instead of temp var.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Motorized throwing machine.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Motorized reviews.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-09-01 02:02:40 -07:00