Commit Graph

365 Commits

Author SHA1 Message Date
Repede 734ead1be6 Ready to review version 2024-01-18 18:37:54 -05:00
Repede 29fd7df39f Draft 2024-01-18 00:47:56 -05:00
izac112 2fdeac8c38 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2023-12-28 09:22:14 +01:00
Killian 18db06fee8 Update metals.dm 2023-12-20 01:37:37 +00:00
izac112 5052f6f672 Merge branch 'release' of https://github.com/VOREStation/VOREStation; branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore into izac 2023-11-28 16:48:53 +01:00
Killian 8b3836b779 hardwood parquet 2023-11-17 12:22:40 +00:00
izac112 a17d96cb92 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-10-30 11:24:00 +01:00
Heroman 9a94306585 Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one 2023-10-01 09:34:43 +10:00
Killian 1eea78cce7 wall/table icon_base split
couple of missing/incorrect things
2023-09-05 20:58:38 +01:00
Killian a43db14e51 wall/table icon_base split 2023-09-05 17:52:02 +01:00
izac112 4088f40cc9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 18:27:07 +02:00
Killian b966afe0a0 staves 2023-07-29 22:08:24 +01:00
Heroman 3b40b37f9c Fluff updates 2023-07-18 15:10:43 +10:00
izac112 4cc81d7c73 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-03-19 22:24:48 +01:00
Varlaisvea 1ae49ef905 the little construction pr 2023-03-08 23:24:56 -05:00
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
izac112 53f54d78e6 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-01-03 21:12:41 +01:00
Heroman 547382e647 Fixes autolathe and smartfridge issues 2022-12-28 17:43:04 +10:00
izac112 2ef553df70 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-12-02 16:33:11 +01:00
Heroman 86bf9d629f Fixes comfy chair recipies being removed by broken mirror 2022-11-15 06:50:42 +10:00
izac112 dc36fe9b8f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-10-16 22:52:41 +02: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
izac112 8f96195fdb Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-07-23 13:40:54 +02:00
Heroman 768175869b Makes multiple frame parts makeable on same tile 2022-07-17 10:11:09 +10:00
izac112 71d069887c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-07-08 15:49:48 +02: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
izac112 cd26d7770a Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-05-16 19:14:19 +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
izac112 235cd04931 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-04-09 10:50:28 +02:00
Heroman f4d1f825f7 Nerfs gravitons and morphium, adds lots of boards into autolathe 2022-04-09 05:44:36 +10:00
izac112 d1e595e7e7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-02-20 23:23:34 +01:00
izac112 aef8a94e94 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-02-19 18:19:45 +01: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
izac112 99243b1ce0 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-11-02 11:47:33 +01:00
Killian 70b88ad181 hardwood material port 2021-10-28 10:21:38 +01:00
izac112 baf5a6a16f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-09-24 12:10:50 +02:00
izac112 f3c88225ce Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-08-29 10:22:30 +02: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
izac112 06528b0674 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-08-16 21:05:37 +02:00
Aronai Sieyes a8bf24b119 Merge pull request #11103 from Very-Soft/rocks
Survival crafting stuff
2021-08-16 12:00:42 -04:00
izac112 846ee352c3 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-08-15 09:19:03 +02: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