389 Commits

Author SHA1 Message Date
izac112 87ce13b27c Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2 2024-12-04 15:17:00 +01:00
izac112 058f219cb9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-11-30 23:30:26 +01:00
Killian 4869595855 ring/watch accessory transfer 2024-10-29 00:23:23 +00:00
Kashargul b594520a74 next set of spans (#16434)
* next set of spans

* some more

* next

* next

* next

* .

* text...

* next... rest soon

* .

* .

* ok last set for the night

* .

* .

* .

* .

* some more

* next

* next

* all for now

* .

* some more easy ones

* some more easy ones

* .

* .

* some more bolds

* oups auto complete moment

* add the remaining spans

* this as well

* this as well

* .

* .,

* resync them properly
2024-10-16 23:37:27 +02:00
Kashargul a2c673ab7a refactors most spans 2024-10-02 21:10:31 +02:00
Kashargul e0d694e8ac rid of old span macros 2024-10-01 23:51:48 +02:00
Guti 1862c0e11b Deconf 2: Electric Boogaloo 2024-09-27 13:43:21 +02:00
SatinIsle 21bf516fc0 Replicant Species
This PR makes the replicant outsider species a whitelist species after an application was made to play one as a crew member.

Added the Gamma Replicant station species, accessible via whitelist only. This species has additional weaknesses (radiation and shock). They have a few unique organs: The crew version of the rage heart can only activate once every 60 minutes (rather than every minute) but lasts for 40 seconds. The mending lungs repair a few organs very very slowly, instead of extremely quickly. The plasma sac generates plasma a little faster without added phoron.

Changed ventcrawl to specifically allow replicants to take underclothes and pocket sized items with them. I've balanced this for replicants only, but could remove the species check if wanted.

Changed alien and resin structures so that they can also be destroyed by replicants (though more slowly than aliens).

Added the user to the whitelist as approved here: https://forum.vore-station.net/viewtopic.php?f=45&t=2448&p=14179#p14179
2024-09-22 10:30:14 +01:00
Guti 409aaba802 Remove 2024-09-09 02:36:53 +02:00
izac112 42b345b3cc Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-08-28 20:22:38 +02:00
Novacat ad00f7a5fe Merge pull request #16157 from KillianKirilenko/kk-floors
Tech tile fixes
2024-08-09 22:57:54 -04:00
Killian 4996649f16 craftable shelves 2024-08-05 08:06:43 +01:00
Killian 388736f98d techmaint tile fixes 2024-08-03 18:28:13 +01:00
izac112 95279d346e Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-515 2024-04-24 23:28:19 +02:00
Reo Lozzot d39d966206 Fixes inconsistant material refunds and removes material cost from door repair (#15511)
* Oops did two different things at once

Started out with me fixing improper material refunds on deconstructs, ended with me making doors not cost materials. Oops!

* Graaah code fixius

I know how new works now

* Huge fart on PR

I am so good at code
huge fartius

epic /obj fail

I forgor

* More effort than it's worth.

unless im being lied to...!
2024-04-11 18:10:04 +10:00
izac112 153c3abf2e Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-26 03:37:23 +01:00
Drathek 7c8bb85de3 Whitespace Standardization [MDB IGNORE] (#15748)
* Update settings

* Whitespace changes

* Comment out merger hooks in gitattributes

Corrupt maps would have to be resolved in repo before hooks could be updated

* Revert "Whitespace changes"

This reverts commit afbdd1d8442973f5d570c30920d9d865b5acd479.

* Whitespace again minus example

* Gitignore example changelog

* Restore changelog merge setting

* Keep older dmi hook attribute until hooks can be updated

* update vscode settings too

* Renormalize remaining

* Revert "Gitignore example changelog"

This reverts commit de22ad375d3ee4d5930c550da2fd23a29a86e616.

* Attempt to normalize example.yml (and another file I guess)

* Try again
2024-02-20 11:28:51 +01:00
izac112 9402b12322 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-08 18:19:52 +01:00
Kashargul 884714838a girder refund 2024-02-01 21:11:35 +01:00
Kashargul 691c3ca75f porting healthbars from RS + mat fixes 2024-01-29 00:00:25 +01:00
Kashargul 067b85dd26 we never want half or empty stacks 2024-01-27 22:47:15 +01:00
izac112 1c2d4da6bd Merge branch 'release' of https://github.com/VOREStation/VOREStation into uppstream-update 2024-01-22 05:18:14 +01:00
Kashargul e4b62dfa35 remove static chat colour tags 2024-01-21 12:34:53 +01:00
Nadyr 9347a99f5b Ports QoL, upgrades, and a lot of bug fixes 2024-01-18 21:04:36 -05:00
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