cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-01 11:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,944 Commits 8 Branches 26 Tags
eba33dfeaff59d61bcfa0972de14ee4e7537e2ca
Commit Graph

403 Commits

Author SHA1 Message Date
Casey
e0ef010384 Merge pull request #13114 from Heroman3003/happycarpet 
Adds Happy carpet
 2022-06-18 23:58:23 -04:00
Heroman
8e1b2e6ea1 Adds Happy carpet 2022-06-19 11:53:23 +10:00
ItsSelis
2d7b081a55 Input Conversion Part 2 2022-06-19 03:40:24 +02:00
Casey
0f7ef0cce1 Merge pull request #12800 from VOREStation/upstream-merge-8556 
[MIRROR] Adds Some More Decorative Flooring Types
 2022-06-18 20:44:13 -04:00
VerySoft
f7f9d4f5f0 Fixy 2022-06-18 20:31:11 -04:00
Foopwo
74c2b0e62a Fixes plating v3b grass. Removes unused sif tile items. 2022-05-22 13:52:31 -07:00
FartMaster69420
452f71dc5d Fixing bug 
Moving checks from a single line into a proc and added a check to prevent zero sheet stacks from merging.
 2022-04-28 22:55:25 -04:00
Sypsoti
4cbe9a028e Adds Some More Decorative Flooring Types 2022-04-19 12:12:56 -04:00
FartMaster69420
d7abb2e81e Fixing issues 
Adds a check for stacktype and a turf check, preventing bad behavior.
 2022-04-14 00:01:59 -04:00
FartMaster69420
f121f7fa1a Final 
Removing debug stuff and disabling minitest
 2022-04-06 21:26:45 -04:00
FartMaster69420
8fa89518ba Cleanup 2022-04-06 21:01:13 -04:00
FartMaster69420
0f71072173 Stacking Stacks 2022-04-06 20:40:08 -04:00
VerySoft
ed8c68e74a Item Bank - Do not store things crafted from material stacks 
The item bank doesn't store what such things are made out of, and so, such things will not be correct when retrieved. 

This does not block things from being stored when made from the common crafting menu though, since those things spawn a defined item type instead of setting up material properties.
 2022-02-19 20:23:42 -05:00
Aronai Sieyes
8c90e32ef3 Fix annoying runtime with exosuit fab 2021-08-26 19:51:00 -04:00
Aronai Sieyes
e52031d6aa Make stack amount var private 2021-08-19 21:06:46 -04:00
Heroman
9a690a41df Fixes in split instead of input 2021-08-11 07:17:21 +10:00
Heroman
face394b62 Fixes infinite material duplication in R&D 2021-08-11 06:57:48 +10:00
Aronai Sieyes
3075ca8b01 Add arcadey carpets 2021-07-29 14:31:40 -04:00
Aronai Sieyes
34982728cb Add 'as anything' to various for loops 2021-07-20 12:39:59 -04:00
Aronai Sieyes
7978b75a2e Merge pull request #10993 from MarinaGryphon/issue/logpile 
Stack Examine Improvements, Log Examine Fix
 2021-07-09 12:18:22 -04:00
MarinaGryphon
7820442652 Fix log examine being weird. 2021-07-09 08:35:11 -05:00
MarinaGryphon
caee8d45b4 Changes existing do_afters to new exclusive flags. 2021-07-08 12:45:55 -05:00
Aronai Sieyes
8bcd31c91e Merge branch 'master' into Arokha/matdefs 2021-07-07 14:29:30 -04:00
MarinaGryphon
e41c2ecfd7 first pass (emotification, some \the -> \The) 2021-07-05 09:42:48 -05:00
Aronai Sieyes
b71c7e7271 Use material defines more 2021-07-03 18:18:05 -04:00
Aronai Sieyes
4c12504e3b Replace list inputs with tgui_input_list 2021-06-26 10:39:56 -04:00
Aronai Sieyes
85c31e9fda WIP fix of this PR 2021-06-21 19:29:43 -04:00
ShadowLarkens
f1f0c3c7b2 Stack: Fix stack/use having a potential to sleep 2021-06-12 18:17:47 -07:00
Aronai Sieyes
da4837903c Merge pull request #10433 from VOREStation/upstream-merge-8085 
[MIRROR] Linter Introduction + Cleanup
 2021-05-27 12:31:23 -04:00
Neerti
767e655310 Linter Introduction + Cleanup 2021-05-25 23:19:34 -04:00
Aronai Sieyes
e26a84c59e Allow better mapped-in marker beacons 2021-05-25 22:28:20 -04:00
Atermonera
d9fffdd07b Moves material stacks to modules/materials 2021-04-22 18:59:27 -04:00
Atermonera
72d1741b6b Tanning Tweaks 2021-03-30 01:50:39 -04:00
Unknown
190b805cad this sucks 2021-03-09 15:49:07 -05:00
Novacat
cc7f72a991 Merge branch 'master' into upstream-merge-7756 2021-03-09 15:11:54 -05:00
MistakeNot4892
3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
Mechoid
ea73111f61 Industrial Expansion 2021-01-27 23:30:50 -05:00
Nadyr
4989c4423a Fixes sif forest grass, adds overgrowth tiles (#7841) 2021-01-27 14:21:17 -05:00
Mechoid
02ffbbe79b Gadgets & Gizmos 2021-01-15 01:56:01 -05:00
Atermonera
e052ff9517 Sheet Recipe Unexclusivity. 2021-01-14 01:11:20 -05:00
Mechoid
b95a10af1a Plainleather & Tobacco (#7762) 
* Rebrands leather to plainleather. Add tobacco and red-caps, redwood tallcaps.

* Seedpacket

* Sinks are wet.

* User
 2020-12-07 19:50:50 -05:00
Mechoid
814375ea3b Matter Matters 2020-12-02 02:30:32 -05:00
Mechoid
019926cbc7 Fresh Meat, Leatherworking 2020-11-07 15:08:04 -05:00
Atermonera
125ef651c8 Adds sifgrass floor tiles. Grass tiles spawn greengrass (#7714) 2020-10-17 02:05:55 -04:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Cerebulon
95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
ShadowLarkens
735230d642 TGUI Metal Menu (Travis stop it) 2020-09-11 21:21:50 -07:00
ShadowLarkens
dd4f9c9967 TGUI NTOS - Total Conversion 2020-09-05 17:02:58 -07:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
BillyBangles
75901775a0 Adds marble floor tiles and crafting recipe (#7264) 
* Adds marble floor tiles and crafting recipe

* swaps screwdriver removal for crowbar

* changelog fix
i'm a silly goose and forgot to edit out the screwdriver bit
 2020-06-06 14:36:25 -04:00