Commit Graph

41 Commits

Author SHA1 Message Date
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
nemvar
91c146a00e Crafting can now pull stuff from your pockets and also put it into your hands. (#46045)
That's pretty cool right?
2019-08-24 01:08:58 -07:00
py01
2d00abba6d Improvised shotgun shell recipe simplification (#45792)
* improv shotgun shell recipe change

* improv shell craft time

* Update recipes.dm

* Update recipes.dm

* Update recipes.dm
2019-08-12 20:17:15 -07:00
Denton
d98df6e063 Refactors plastic explosives
y
2019-08-02 22:31:05 +02:00
Rob Bailey
6a26744d83 Clothing /under repath (#45548)
About The Pull Request

repaths clothing/under to be more sane
Also fixed a couple of bugs relating to pathing being incorrect, and modified a couple of bad descriptions and names
Also adds a map path updating script, which also helps show the full repath.
Why It's Good For The Game

improves maintainability, makes mapping easier, stages for a clothing dmi split
Changelog

cl
refactor: repathed all under clothing, keep an eye out for errors
/cl
2019-07-30 19:20:21 +12:00
nemvar
876db778a7 Durathread and loom changes. (#45261)
* Reworked loom and cloth

* newline

* Removes unneeded .=

We were returning TRUE regardless.
2019-07-21 17:40:00 -07:00
Krysonism
1edc7fb582 Add cowboy boots! (#44880)
This PR adds 6 new types of cowboy boots. Brown, black and white
cowboy boots have been added to the clothesmate. Two types of lizard
skin boots can be crafted, these boots can then be exported for money.
An additional pair of fancy boots are currently unobtainable, but will
be part of a future project. Cowboy boots can now act as shelter for
some type of snakelike creatures, fill a pair with snakes as a prank
or harebrained assassination plot.
2019-07-05 12:08:22 -07:00
oranges
64460ae3ca Merge pull request #44825 from AutomaticFrenzy/patch/lints
In advance of eventually adding SpacemanDMM's linter to Travis, fix everything it can currently detect.

Some lists, including global lists, are given types so that L[i].foo expressions can be checked.

Some procs are given a new form of return type annotation so that DuplicateObject(O).forceMove()-type invocations can be checked.

Open to syntax suggestions on the return type annotations, and on whether the preprocessor strategy makes sense.

Return type syntax is currently roughly:

    <typepath> | <paramname>([_])*(.type)?
2019-07-03 19:31:11 +12:00
Shaps
e799621f0b Changes improvised jetpack recipe (#44794)
* Corrects crafting recipe

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

Co-Authored-By: nemvar <47324920+nemvar@users.noreply.github.com>
2019-07-01 20:52:07 +02:00
Rob Bailey
532cc7ea63 Smart cable fixes (#44784)
I wanted to get this up next day but I kept falling asleep before finishing what I wanted to
About The Pull Request

Fixes some issues that have been brought to my attention with smart cables

Closes #44768
Closes #44775
Why It's Good For The Game

this shit pretty broke as is in game.
Changelog

cl
fix: removed mech rcl from the research node so it stops spamming a warning in log
fix: cables now disconnect machines when cut
fix: terminal linking/not linking behavior with smeses has been improved
fix: couple of small mapping fixes
tweak: changed cable coils back to 30
tweak: changed the box smes room a little to prevent stacking terminals
tweak: removed the rpcl from engineering on every map because it's not used for wiring anymore
/cl
2019-06-27 12:20:49 +12:00
Tad Hardesty
b07065a477 Add additional type annotations to lists 2019-06-25 22:48:10 -07:00
nemvar
d9761d448d Adds primal farming implements. (#44388)
About The Pull Request

Adds a rake (reskinned cultivator) and a wooden hatchet to the ashwalker base. Replaces their bucket with a wooden bucket.

Added crafting recipes for the rake and wooden bucket.
Why It's Good For The Game

It looks more flavourful (inb4 where did they get the wood from) and adds a bit of functionality to unused content (i.e. ashwalker farming).
Changelog

cl
add: Added wooden farming implements to the ashwalker base.
add: Makes rakes and wooden buckets craftable.
/cl
2019-06-17 13:34:15 +12:00
nemvar
94d25d1024 Adds craftable firebrands. (#44376)
* Prometheus

* /aaa
2019-06-08 20:19:42 -04:00
Razharas
c55145299a Componentizes menucrafting (#44221)
Fixes menucrafting opening a new window when finishing construction
2019-06-04 17:01:45 -04:00