Commit Graph

128 Commits

Author SHA1 Message Date
Qustinnus
908ccfe7b3 Fixes some material datum bugs (#47049)
* fixes

* chair

* ass

* fixes

* dumb

* done

* fix
2019-10-14 00:36:56 -04:00
Qustinnus
270f73671e fixes mats (#46994) 2019-10-09 20:10:55 +02:00
Qustinnus
a394ccdc2b Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)
removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)

this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.

also applies materials to everything, with fixes, which can close #46299
2019-10-08 11:06:02 -04:00
Twaticus
70b68366e4 More Carpets & Tables (#46850)
Ports carpets from TauCetiStation
Original PR: TauCetiStation/TauCetiClassic#2989
Adds tables to match the carpets

Carpets Good. Tables Good.
Changelog

cl
imageadd: 8 new carpets and fancy tables
add: exotic carpet crate
/cl
2019-10-06 18:09:16 +13:00
Rob Bailey
26b04ede42 Obliterates item_color: new washing machine functionality edition (#45961)
About The Pull Request

Completely removes item_color and the clusterfuck of bad programming it caused.

In places where item_color was used for entirely unique purposes it was split off and renamed to a new var on that typepath only, or refactored so it wasn't needed

In places where item_color was used as a dye color, it was converted to the new dye_color var

In places where item_color was used as the worn overlay it was removed and instead now icon_state is always used as the clothing overlay.

A new mob_overlay_icon var was added for manually setting where the mob overlay icon path is for specific items.

Moved some mob overlay files relating to clothing to their own directory as well for organization purposes.

Totally refactors washing machines, instead of the horrible abortion that was iterating through the typepath it now uses a registry of dye results.

Some bonus functionality to come out of this:
the washing machine now supports arbitrary dye colors.
Why It's Good For The Game

It's been 4 years since the "this should be deprecated soonish" comment was added, and this var is a shitpile of confusion if you just trace the usage of it.
Changelog

cl
add: Washing machines now support arbitrary dye color
add: Washing machines now dye nearly every item.
refactor: lots of backend changes to clothing overlays, report any issues
/cl
2019-08-26 20:38:11 +12:00
Dennok
d464a7c689 add flag CHANGETURF_INHERIT_AIR 2019-08-04 12:54:12 +03:00
ShizCalev
6e44bd3a93 Merge pull request #44796 from kingofkosmos/addswarningspans
Adds warning-spans
2019-07-02 00:47:43 -04:00
Tlaltecuhtli
c94507576e stacks no longer give you a pop up window when you alt click on one on the floor (#44691)
cl
tweak: stacks no longer give you a pop up window when you alt click on one on the floor
/cl

its rather obnoxious when you try to grab something from a tile (example after an explosion) which has some giant sprites of rod/tiles/metal and you want toalt click to see the tile content but instead you have to pixel snipe else you get a pop up window

99% of the time you want to grab part of a stack you do it in hand or in the bag anyway which have no effects from this pr
2019-06-30 09:52:34 +12:00
kingofkosmos
ec5c82029a * "Is already...", "Can not...", "Not when..." etc. 2019-06-27 06:15:43 +03:00
vuonojenmustaturska
8ddc9677c7 examine-code refactor (#44636)
* 1/4 done? maybe?

* more

* stuff

* incremental stuff

* stuff

* stuff & things

* mostly done but not yet

* stuffing

* stuffing 2: electric boogaloo

* Git Commit and the Kingdom of the Crystal Skull

* make it actually compile

* found more stuff

* fixes

* fix AI laws appearing out of order

* fix windows

* should be the remaining stuff

* this time for real

* i guess it should compile too

* fix sechuds
2019-06-19 22:07:57 +02:00
nemvar
94d25d1024 Adds craftable firebrands. (#44376)
* Prometheus

* /aaa
2019-06-08 20:19:42 -04:00
Tad Hardesty
6f4f462933 Add a missing period when splitting stacks (#43604) 2019-04-15 14:40:30 -04:00
Time-Green
9861efde71 Cryokinesis and Geladikinesis mutations (#42453)
* Adds cryokinesis and renames the cold resistence file to space adaptation

* adds cryokinesis

* fixes icon conflict

is there actually a proper way to fix them thats not copying master and reimplimenting your own sprites?

* fixes a typo and lowers instability of cryokines by 5

* Apply suggestions from code review

Co-Authored-By: Time-Green <timkoster1@hotmail.com>

* maybe reverts line ending?

* unfucks flags?

* probably unfucks line endings

i swear to fucking god why does it even do this. i never even touched the file and reverting it to master doesnt do anything. fuck you git
2019-01-23 15:20:56 -05:00
coiax
02aba6b205 Microwaves now have a single wire (#41822)
cl coiax
add: Microwaves have a single wire accessible when open, the activation wire.
When cut, the microwave will no longer function, when pulsed, the microwave
will turn on.
add: Stabilized dark purple extracts now cook items in your hands, rather than dropping
the cooked item on the floor.
/cl

Previously microwaves just worked on their contents, now they keep a subset of contents called ingredients, because otherwise it would explode whenever you put a signaler inside.

Someone asked me to do it. It seemed like a neat idea. God knows
what horrible things people will do with this.
2018-12-16 12:56:08 +13:00
4dplanner
c84a92f4ce Passes thrownthing to hitby (#41411)
* Passes thrownthing to hitby

* Items now also pass thrownthing

* No longer uses default arguments

Also fixes bananium shield

* Adds more arguments to hitby calls

* Standardises throw_impact

* Clears up some loose ends

* Adds back wacky comment

* Reinstates can_push=FALSE on bananium shield
2018-11-15 10:25:04 +01:00
MrDoomBringer
703a365aec Various code improvements (#40932)
* adsf

* asdf

* take these

* Further cleanup to windoor code
2018-10-21 03:01:02 -04:00
Irafas
90811b9786 Fixes players being unable to construct on the same tile as a directional window (#39088)
* Can build on top of windows

-Players can now build things while standing on the same tile as a directional window.

* Changed the check for fulltile

-This actually covers all fulltile windows

* No more stacking windows

-Full tiles can no longer be built on top of directional windows
-Directional windows can still be built on the same tile as long as they dont face the same direction

* Now contains 50% less IF!!

-Put both if's into one

* Still pretty fucky

-If the dir of the constructed object has var fulltile set to TRUE then FULLTILE_WINDOW_DIR will be passed to the method valid_window_location else the user's dir is passed.

* just a space

* Now gets initial dir of object being built and passes that to valid_window_location
2018-07-18 10:26:53 +02:00
AnturK
d71b205133 Clears stuff detected by SM's parser. 2018-07-03 12:32:06 +02:00
YPOQ
ceb9798625 Fixes stacks created with 0 amount 2018-05-09 20:28:54 -06:00
YPOQ
c26a19d523 Removes recursion 2018-05-09 17:37:03 -06:00
YPOQ
6327b79db6 New stacks now auto-split if amount > max_amount 2018-05-09 13:53:47 -06:00
Jalleo
5d2db204bc [s] Small tweaks and fixes a edgecase with machine construction (#37494)
* Puts back required time for the emitter and field_generator and also removes a certain issue that certain people were causing

* Couple of things I missed

* I noticed the error with regards to atom and changed to obj like I was trying to originally. Also its fine to build on tables that wasnt the issue with this specific aspect.

* Edge windows. We need those.

* optimised the checks to be behind a if check for when you are actually needing to make something for the floor...

* Corrects a input proc by request

* Working is not my strong suit.
2018-04-30 13:01:43 +03:00
Davidj361
e5d407a1a9 Added cancel button (#36953) 2018-04-06 11:48:02 +03:00
kevinz000
f300a5c155 Interaction/Attack Hand Refactor (#36405) 2018-03-23 11:20:54 +01:00
ShizCalev
bfde5ac057 [s] Fixes altclick exploits (#35456)
* Fixes altclick exploits

* Removed free spam, fixes monkey altclicks

* replaced named args with proper defines

* More cleanup and fixes

* Better yet

* Another exploit fix

* pet carrier fix
2018-02-11 16:06:12 +13:00
ACCount
100c4b6114 Adds new helper: use_tool, shakes things up in tool code (#35095)
* small changes

* Adds a use_tool helper and changes some tools to use it

* Ports most tool operations to use_tool

* Converts more tool operations to use_tool and tool_act

* Changes some things to default_unfasten_wrench

* Improves tool_behavior support in mech construction

* Code review memes

* Fixes all instant use_tool calls failing

* Code improvements

* merge fixes
2018-02-06 11:02:53 +01:00
Ashe Higgs
6ba865b112 makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things (#34888)
* traps patch

* flags!
2018-02-02 11:14:38 +01:00
uraniummeltdown
57fc27f7f7 corrects some \ref macros 2018-01-30 15:38:50 +05:00
John Ginnane
2587222509 Fixed alt-click not working with stacks (#34396)
* Can disable auto-merge

New argument which lets you stop stacks from automatically merging when picking them up

* Fix 0 stacks

* Updated simple_animal/put_in_hands()
2018-01-14 23:04:18 -05:00
kevinz000
05be346f8a Component Forensics, Blood Decals, and Cleaning 2017-12-24 18:19:43 -08:00
Dax Dupont
a56dda599b 2 borg metal fixes for the price of one (#33738) 2017-12-22 19:50:41 -05:00
Emmett Gaines
25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -05:00
Ashe Higgs
d447acdc6e All-In-One grinder results are now defined by type, not by huge lists (#33181)
I had some time free, and noticed how awful the reagent grinder code was - it used huge static lists containing types and their associated reagents from grinding.

This is now split into two new vars on /obj/item - var/list/grind_results and var/list/juice_results, as well as two new helper procs, on_grind() and on_juice() to allow those to change based on conditions like plant potency. Such checks and the like have been moved to that. If any of these procs return -1, the operation is canceled.

I also fixed some of the recipes that didn't work. The reagent IDs for them didn't exist, leading me to believe that they weren't tested. I corrected that! (I've tested every single recipe in this PR, with the exception of a few juicing-related ones.)
2017-12-15 10:48:25 +13:00
uraniummeltdown
16de0ac52a Stack Recipe Lists (#33081)
* ports baycode stack_recipe_list
comfy and office chairs use stack recipe lists

* removed some src. and made list_recipes() into interact()

* /datum/browser for stack menus

* revert unnecessary edit
2017-11-27 13:16:34 +01:00
Emmett Gaines
7c69cdcb8a Revert math (#33059)
* Revert "all this wrapping and it's not even christmas (#33035)"

This reverts commit faaf151580.

* Revert "fuck me for forgetting to graph this one"

This reverts commit 45d7acea2f.

* Revert "defines math"

This reverts commit 2817a1737b.
2017-11-23 20:59:52 -05:00
ninjanomnom
2817a1737b defines math 2017-11-22 17:36:58 -05:00
kevinz000
caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
Emmett Gaines
825ab4def4 [512] The great \ref purge (#31824)
* The great \ref purge

* cleanup
2017-10-28 17:20:04 -04:00
Emmett Gaines
4cc3daa528 Greyscale cables (#31972)
* cable code is shit

* cleanup
2017-10-25 22:46:38 -04:00
YPOQ
3124973aa3 Fixes being unable to merge full stacks (#31992) 2017-10-23 01:08:53 -04:00
vuonojenmustaturska
d3e2eae57d stops message spam (#31742) 2017-10-16 23:10:17 +02:00
Jordan Brown
d3dcc118ec Merge pull request #31340 from Firecage/codeshitnotshit
Does some code standardization/consistency.
2017-10-05 15:53:11 -04:00
YPOQ
5a616895ed Fixes crafting stacks without breaking crafted machinery (#31298)
* Revert "Fixes stacking when crafting items"

* Fixes crafted stacked items properly

* Update stack.dm
2017-10-05 10:24:34 -04:00
Firecage
ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage
2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
bawhoppen
9b7f1ada6b Moves all stack object sprites from items_and_weapons.dmi to their own file (#31273)
* keeko

* forgot the file
2017-10-04 12:59:27 -04:00
kingofkosmos
086d636b17 Alt-clicking descriptions when examining (#30988)
* Adds what alt-clicking does into examine-messages.

* whoops fix

* AI holopad examine remove

* Fixed cigarette pack alt-clicking.

* Spear alt-click-message set to show only if explosive lance.
2017-09-29 15:51:31 +13:00
Jordan Brown
4a938abaa6 Merge pull request #30746 from YPOQ/stackfix
Fixes stacking when crafting items
2017-09-16 17:32:35 -04:00
YPO
35378dc7f3 cleanup 2017-09-14 22:49:54 -06:00
YPO
5c9fe55858 Fixes stacking when crafting items 2017-09-14 16:31:46 -06:00