Casey
7b62bb9d2a
Merge pull request #14617 from TheToaster98/ErisFloors
...
Allows the crafting of Eris-style floors
2023-03-08 19:07:31 +00:00
Heroman3003
7717c49c87
Merge pull request #14565 from Heroman3003/atuolaathe
...
Fixes hull-made items putting hull materials in my autolathe
2023-02-26 09:46:09 +00:00
Razgriz
fed8c75408
Fix plastic feeder recipe so that it isn't under sofas ( #5610 )
...
* Fix plastic feeder recipee so that it isn't under sofas
* Update plastic_ch.dm
* god please
2023-01-26 02:02:40 -07:00
Heroman3003
165d947e91
Fixes autolathe, material and smartfridge issues
2022-12-28 21:48:06 +00:00
Casey
e9c0b6ee31
Merge pull request #14087 from Heroman3003/mirro-fixes
...
Fixes comfy chair recipies being removed by broken mirror
2022-11-17 02:33:55 +00:00
Bib Bob
c854be9fae
can I have a sheet on my bed
2022-11-05 18:51:20 -05:00
Razgriz
cf301c6346
[Manual MIRROR] Release Bugfixes and changes (MERGE BEFORE RELEASE)
...
Unfucks https://github.com/CHOMPStation2/CHOMPStation2/pull/5019 due to yet another github merge conflict with a god damn .dmi file. Missing map files, but that's ok because that's for virgo specific maps.
2022-09-23 00:14:16 -07:00
Razgriz
fa6ecc5cee
Merge pull request #5004 from CHOMPStation2/upstream-merge-13467
...
[MIRROR] [MIRROR] conk rete (ABLE TO BE MERGED)
2022-09-22 22:10:59 -07:00
Razgriz
983fb72a3f
powder that makes you say yes
2022-09-22 21:03:29 -07:00
Razgriz
69883123d9
powder that makes you say yes
2022-09-22 21:03:08 -07:00
VirgoBot
a3c824dcc8
[MIRROR] Fixes directional overlays on padded comfy and rounded chairs (ABLE TO BE MERGED) ( #13010 )
...
* Fixes directional overlays on padded comfy and rounded chairs
* Fixes mirror conflicts (#13411 )
* Update chairs.dm
* Update chairs.dm
Co-authored-by: Cerebulon <tanhindmarsh@yahoo.com >
Co-authored-by: Poojawa <Poojawa@users.noreply.github.com >
Co-authored-by: C.L <killer65311@gmail.com >
2022-09-23 01:08:46 +00:00
VirgoBot
4acf5e2e67
[MIRROR] conk rete (ABLE TO BE MERGED)
2022-09-23 01:03:49 +00:00
Casey
5c9f7b6b72
Merge pull request #13349 from Heroman3003/frame-parts
...
Makes multiple frame parts makeable on same tile
2022-07-17 09:32:41 +00:00
Novacat
ecf195e93d
Merge pull request #13228 from Heroman3003/unbucket
...
Removes wooden bucket recipe from planks
2022-07-01 21:25:10 +00:00
Casey
b0802ce267
More TGUI Input Conversions
2022-06-19 11:09:42 +00:00
Casey
ff911924b5
Merge pull request #12881 from TankTheBirb/master
...
Pocket pouch rebalance + obtaining method
2022-05-08 09:44:33 +00:00
Razgriz
28c173e92b
revert morphium nerf
2022-04-10 13:26:26 -07:00
Casey
3f3a075f97
Merge pull request #12687 from Heroman3003/nerfnd
...
Nerfs gravitons and morphium, adds lots of boards into autolathe
2022-04-09 04:21:25 +00:00
Nadyr
59090266bd
Merge pull request #3717 from CHOMPStation2/upstream-merge-12286
...
[MIRROR] Merge Fixes for 8222
2022-02-19 20:51:16 -05:00
Casey
592777ba9b
Merge Fixes for 8222
2022-02-19 22:04:54 +00:00
Casey
8bfa8b09ab
Fixes sofa paths
2022-02-18 19:05:41 +00:00
Test Turtle
3c06b4dc19
Update to Sheet Materials
...
While this doesn't revert all the changes upstream to the mining materials, it does replace most of them with sprites from other servers, which I feel are more appropriate here.
2022-02-07 17:20:45 -08:00
Nadyr
4a94043fe9
powder that makes you say yes
2021-10-30 23:02:45 -04:00
Chompstation Bot
da9e3383a8
Hardwood Material Port
2021-10-30 21:25:32 +00:00
Chompstation Bot
4dd3ea4d15
Overhauls Resin ability, deletes unused xeno sprites, fixes few things.
2021-09-24 03:19:02 +00:00
Nadyr
679ecb0915
powder that makes you say yes
2021-08-27 20:24:36 -04:00
Nadyr
ef6bdcf608
powder that makes you say yes
2021-08-27 20:24:09 -04:00
Nadyr
6d41a6f8d6
powder that makes you say yes
2021-08-27 20:23:35 -04:00
Nadyr
e890164eb4
powder that makes you say yes
2021-08-27 20:22:37 -04:00
Nadyr
2e4d98fc0c
powder that makes you say yes
2021-08-27 20:21:57 -04:00
Nadyr
ad22afcf43
powder that makes you say yes
2021-08-27 20:20:49 -04:00
Nadyr
b3842a8783
powder that makes you say yes
2021-08-27 20:19:45 -04:00
Nadyr
d7ae57d7b5
powder that makes you say yes
2021-08-27 20:18:46 -04:00
Nadyr
17dd7c3b3e
powder that makes you say yes
2021-08-27 20:14:28 -04:00
Chompstation Bot
af0d7a0f6b
Make stack amount var private
2021-08-26 15:39:04 +00:00
Aronai Sieyes
72f5e790db
Upstream-11421
2021-08-24 21:10:20 -07:00
Chompstation Bot
1372d838e1
Port Bay and Eris walls
2021-07-22 20:29:32 +00:00
Chompstation Bot
d0d23ed393
Fixes a bunch of bools missed in #11100
2021-07-16 21:12:20 +00:00
Nadyr
ab141bf081
powder that makes you say yes
2021-07-13 22:47:26 -04:00
Chompstation Bot
50dd8ad121
Fix crafting menu, add plant fiber crafting things
2021-07-11 19:16:38 +00:00
Nadyr
60fa095962
Merge pull request #2488 from CHOMPStationBot/upstream-merge-10993
...
[MIRROR] Stack Examine Improvements, Log Examine Fix
2021-07-10 01:47:29 -04:00
Aronai Sieyes
205ef740bd
Merge pull request #10993 from MarinaGryphon/issue/logpile
...
Stack Examine Improvements, Log Examine Fix
2021-07-09 16:19:16 +00:00
Chompstation Bot
287a5deee3
Use material defines more
2021-07-07 19:02:05 +00:00
Aronai Sieyes
68bf885c8e
Merge pull request #10921 from VOREStation/Arokha/fixglass
...
Fix glass sheets construction menu
2021-07-05 23:58:05 +00:00
Chompstation Bot
14129d60cf
Converts visible_message notice spans to look more like emotes
2021-07-05 20:30:12 +00:00
Chompstation Bot
275458f14a
Port in-game painting from /tg/
2021-07-03 22:31:15 -04:00
Chompstation Bot
ea9582b5b1
Further Map Changes
2021-07-03 21:15:08 +00:00
Chompstation Bot
b6e1989a01
The One Where I Port Modals
2021-06-30 19:29:34 +00:00
Chompstation Bot
55e3dc7904
Port current /tg/ lighting system
2021-06-18 04:23:09 +00:00
Chompstation Bot
a94e471add
Material Container Component & Autolathe QoL
2021-06-13 03:18:30 +00:00
