Commit Graph

326 Commits

Author SHA1 Message Date
TheToaster
257fc6c65f Allows the crafting of Eris-style floors
Many of the floors added along the SD were not craftable, this PR changes it to be the same as the original server (Eris) and allow the crafting of steel and dark floors with steel and white floors with plastic.
2023-03-06 20:19:17 +01:00
Heroman
1e3ae011f2 Fixes hull-made items putting hull materials in my autolathe 2023-02-26 10:45:35 +10:00
Heroman
547382e647 Fixes autolathe and smartfridge issues 2022-12-28 17:43:04 +10:00
Heroman
86bf9d629f Fixes comfy chair recipies being removed by broken mirror 2022-11-15 06:50:42 +10:00
C.L
84181ef54e Release Bugfixes and changes (MERGE BEFORE RELEASE) (#13787)
* Add bricks

* Fixes concrete icon spawning.

Polaris uses a different system for spawning turfs than we do. This fixes a bug with concrete spawning.

* Makes it so you have to load PB in a cryo beaker.

Instead of getting it for free.

* no you don't get free reinforcement

* Concrete can make concrete flooring

* Adds concrete tiles. Fixes spawning

* Being plating is boring. Let's make it a floor.

* Able to remove it.

* Allows fun. Fixes infinite tiles.

* Adds Polaris Gun Sprites

- Allows for easier ports.
- Fixes the semi-automatic-shotgun

* Adds the PSGs - Tether. Fixes the sprite in DreamMaker.

- Adds a PSG to the security EVA (Security players mentioned doing this instead of armory, and it makes sense.)
- Adds a PSG to mining equipment room.

* Adds PSGs to SD

- Adds PSG to Security EVA
- Adds PSG to Mining

* Adds PSGs to GB

- Adds PSG to Groundbase Mining
- Adds PSG to Groundbase Security EVA

* Makes the PSG the actual mining version
2022-09-23 01:01:24 -04:00
VirgoBot
d67a95c46f [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-22 21:07:39 -04:00
VirgoBot
1a8f1760fa [MIRROR] conk rete (ABLE TO BE MERGED) (#13467)
* conk rete

* Update flooring_premade.dm

* Update wall_types.dm

* Update _materials.dm

* Update plasteel.dm

* Update steel.dm

* Update stone.dm

* Update stone.dm

* Update instant.dm

* Update plasteel.dm

* Fixes map changes

Co-authored-by: Greenjoe12345 <33647525+Greenjoe12345@users.noreply.github.com>
Co-authored-by: C.L <killer65311@gmail.com>
2022-09-22 21:03:19 -04:00
Heroman
768175869b Makes multiple frame parts makeable on same tile 2022-07-17 10:11:09 +10:00
Heroman
1a8a6f77e7 Removes wooden bucket recipe from planks 2022-07-01 16:09:25 +10:00
ItsSelis
af64bcf406 More Input Conversion 2022-06-19 12:21:51 +02:00
TankTheBirb
efb0d85f59 adjusted med pouch and added better notes
Med pouch now has 3 small item spaces instead of 4, keeps the fast draw because you can't move at all during it or it interrupts, cannot carry defibs, but can carry lollipops.  Medium and large are still better for packrats with less time sensitive operations.

Also added more //vorestation add things to the stuff I changed that weren't a part of pouches.dm.
2022-05-01 16:09:48 -04:00
TankTheBirb
a531e4e99e Pocket pouch rebalance + obtaining method
You know those pocket pouches you can find sometimes except you don't know where you can get them? Well you couldn't aside from map spawns. This fixes that, you can now make them using cloth, fur, or leather. Leather lets you make the really nice ones because its harder to get, cloth and fur let you make the smaller and specialized ones. Botany is your friend, Wabbacks let you grow cloth, teppi provide fur, and any animal can give you leather. There are also alternate ways to get these things too if botany is kill (unfortunate), but they're more time intensive than just asking the botanist.

Also I changed the contents to be somewhat more sane because the specialized pouches before were STUPIDLY restrictive and inferior in just about every way. So now there is a balance to it. Tools pouch is basically a belt for your pocket but half size. Supplies can carry actually useful supplies. Parts can carry the most of any pouch but literally only stock parts. Medical can draw stuff faster from their pouch and it can carry more medical related supplies than it could before. Ammo lets you carry grenades and plastique explosives now. Baton pouch is now the melee pouch and can fit more than just batons in it (still only one of them tho).
2022-05-01 12:58:59 -04:00
Heroman
f4d1f825f7 Nerfs gravitons and morphium, adds lots of boards into autolathe 2022-04-09 05:44:36 +10:00
Heroman
ae267030eb Merge branch 'master' into upstream-merge-8222 2022-02-19 18:41:29 +10:00
ktccd0
618f11ad3e Fixes sofa paths
Sofas used to have really weird subtypes, now they correctly inherit from either the base (middle), left, right, or corner, which solves the issue with layers on the non-red corner sofas (which red sofas were exempt from due to them being the base object type).
2022-02-16 14:48:28 +01:00
Killian
70b88ad181 hardwood material port 2021-10-28 10:21:38 +01:00
Sym
0e45d5ddea Overhauls Resin ability, deletes unused xeno sprites, fixes few things. 2021-08-28 17:31:01 -04:00
Aronai Sieyes
7994cd6eb3 Bad fix WIP 2021-08-26 12:07:53 -04:00
Aronai Sieyes
e52031d6aa Make stack amount var private 2021-08-19 21:06:46 -04:00
Aronai Sieyes
a8bf24b119 Merge pull request #11103 from Very-Soft/rocks
Survival crafting stuff
2021-08-16 12:00:42 -04:00
Sym
ed7f4b9e75 Fixes corrosive acid, makes most important things unacidable
Makes pretty much anything important to the crew unacidable, fixes how acid interacts with floors.
2021-08-14 10:49:44 -04:00
VerySoft
6ba1086887 ALMOST DONE 2021-08-13 23:12:12 -04:00
VerySoft
bced5fb133 blep 2021-08-09 17:48:10 -04:00
VerySoft
29b29bf8a6 Survival crafting stuff
Stuff! For surviving in the wilderness.
2021-08-09 17:48:10 -04:00
Aronai Sieyes
68c9e6a23d Fix bugs! 2021-07-22 16:01:52 -04:00
Aronai Sieyes
f4daa9e139 Tweak building since bay has a lot more sprites 2021-07-22 16:01:52 -04:00
Aronai Sieyes
6a5d9a5660 Add building steps! 2021-07-22 16:01:52 -04:00
MarinaGryphon
a843667af3 Fixes a bunch of bools missed in #11100 2021-07-16 15:55:49 -05:00
Aronai Sieyes
ca82ce3c20 Add plant fiber material/stacks 2021-07-11 01:55:20 -04:00
MarinaGryphon
7820442652 Fix log examine being weird. 2021-07-09 08:35:11 -05:00
Aronai Sieyes
8bcd31c91e Merge branch 'master' into Arokha/matdefs 2021-07-07 14:29:30 -04:00
Aronai Sieyes
d70bfa6eef Fix glass sheets construction menu 2021-07-05 18:16:20 -04:00
MarinaGryphon
e41c2ecfd7 first pass (emotification, some \the -> \The) 2021-07-05 09:42:48 -05:00
Aronai Sieyes
fda5bd4c7f Port art from /tg/ with stubbed persist 2021-07-03 22:12:49 -04:00
Aronai Sieyes
b71c7e7271 Use material defines more 2021-07-03 18:18:05 -04:00
VerySoft
25c6485e31 Makes the new lights construct-able 2021-07-03 16:48:13 -04:00
Aronai Sieyes
4c12504e3b Replace list inputs with tgui_input_list 2021-06-26 10:39:56 -04:00
Aronai Sieyes
1696db4842 Move most/all overlay use to SSoverlays
Except for the ones I'm about to change in the
lighting commits!
2021-06-17 00:11:13 -04:00
ShadowLarkens
1e9a6e024c Update doc 2021-06-12 20:07:41 -07:00
ShadowLarkens
a3674a664d Autolathe: Implement Material Container Component
First implementation, allows insertion but printing doesn't work yet.
2021-06-12 18:17:46 -07:00
ShadowLarkens
2a70cfe91f MaterialContainer: Add a component to hold materials
No implementations in this commit.
2021-06-12 18:17:44 -07:00
Neerti
767e655310 Linter Introduction + Cleanup 2021-05-25 23:19:34 -04:00
Unknown
594857cd27 Compatibility Fixes Part 1 2021-04-28 12:25:36 -04:00
Atermonera
d9fffdd07b Moves material stacks to modules/materials 2021-04-22 18:59:27 -04:00
Atermonera
3fa568de5e Autolathes don't spam debug on first use (#8019)
Co-authored-by: atermonera <matthew.forsland@revature.net>
2021-04-10 03:42:31 -04:00
Heroman
7452f4a704 Merge branch 'master' into aprilfools 2021-04-01 02:52:36 +10:00
Novacat
f6793b6207 Update material_recipes.dm 2021-03-30 16:16:57 -04:00
Atermonera
72d1741b6b Tanning Tweaks 2021-03-30 01:50:39 -04:00
Heroman
c208e1e12d Finishes it up 2021-03-22 16:13:20 +10:00
Unknown
190b805cad this sucks 2021-03-09 15:49:07 -05:00