Commit Graph
4104 Commits
Author SHA1 Message Date
izac112 153c3abf2e Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-26 03:37:23 +01:00
DrathekandGitHub 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 19e46d19b2 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-17 01:06:24 +01:00
Heroman 55fe8e1657 Adds the Short Stacker 2024-02-11 19:08:49 +10:00
izac112 9402b12322 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-08 18:19:52 +01:00
KashargulandGitHub 691c3ca75f porting healthbars from RS + mat fixes 2024-01-29 00:00:25 +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
Heroman3003andGitHub cd6823c7e0 Merge pull request #15689 from Darlantanis/krakenmynemesis
Many bug fixes, QoL, and PDA notes port (now with sensible diffs)
2024-01-19 14:53:19 +10:00
NadyrandGitHub 9347a99f5b Ports QoL, upgrades, and a lot of bug fixes 2024-01-18 21:04:36 -05:00
KashargulandGitHub 98b8589181 fix runtime and dupe 2024-01-18 23:58:59 +01:00
7e33bd1d78 Update code/game/objects/items/weapons/traps.dm
Co-authored-by: Izac Joof Forsgren <izac10@live.com>
2024-01-15 13:25:36 -05:00
quackjack c985b5e1fd Fin 2024-01-14 22:38:14 -05:00
VerySoft c32d33fad9 Spider
Makes it so that nurse spiders can't spawn from any random sources, such as spider egg clusters, spider spawners, and capture crystals.

GMs and map makers can still put nurse spiders out if they want to, but this should stop any UNEXPECTED nurse spiders from appearing, and stop spiders from snowballing quite so hard when the conditions are right.
2024-01-09 14:59:42 -05:00
Repede 5e525005e4 Puts RSF back to virgo code (removes whatever we did before) 2023-12-24 01:28:21 -05:00
izac112 eddb283c11 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2023-12-18 03:17:20 +01:00
izac112 bd02ad4b78 Updates readme and fixes books slightly 2023-12-15 09:11:56 +01:00
SelisandGitHub 7ccdbb258f Revert "Revert "12/10/23 - Map swap update" (#15593)" (#15594)
This reverts commit f00d13da66.
2023-12-11 00:22:42 +01:00
SelisandGitHub f00d13da66 Revert "12/10/23 - Map swap update" (#15593) 2023-12-10 23:37:45 +01:00
Heroman3003andGitHub 0c18a049a6 Makes gift wrap display its warnings better (#15584) 2023-12-09 21:58:12 +01:00
KashargulandGitHub 8f1df9b616 pry was missing for firedoors 2023-12-09 05:40:18 +01:00
Killian ce93d40c1c protean reconstitutor
construction, components, and upgrades
2023-12-01 10:54:19 +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
Heroman cbd0307a0c Fixes some syndie borg items 2023-11-03 11:59:12 +10:00
Heroman cb9f552988 Adds confetti gun (unused for now) 2023-11-03 06:58:13 +10:00
izac112 a17d96cb92 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-10-30 11:24:00 +01:00
Heroman3003andGitHub aa29834f8d Merge pull request #15434 from Enzo-Leon/altevian
Altevian Adjustments - Descriptions & Small Tweaks
2023-10-05 06:07:48 +10:00
Enzo-Leon f5cc531bb9 Feedback adjustments for improved sentence structue. 2023-10-02 12:27:31 -07:00
Enzo-Leon f13f395db7 Altevian Adjustments - Descriptions & Small Tweaks 2023-10-02 11:40:19 -07:00
Heroman b255b1a8a3 Fixes belts and pouches not being able to hold power tools 2023-10-02 15:54:41 +10:00
Heroman 9a94306585 Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one 2023-10-01 09:34:43 +10:00
Killian cd7d9482e5 locks & keys 2023-09-19 12:25:54 +01:00
Runa Dacino 1b23ff5cdc tweak: Replaces "Iron" pill bottle with blood regen pill bottle
Replaces instances of "iron" pill bottle with the new blood regen pill bottle in containers and maps that are either NanoTrasen or Zorren related. Keeps iron bottles in other maps (mostly specific away mission rewards)

add: Adds Copper pills, Blood regen pill bottles

30 u copper reagent per copper pill. Blood regen contains 9 iron, 5 copper pills now that zorren need copper for treatment
2023-09-10 16:45:26 +02:00
Heroman ba7b9f46a6 Adds Entrepreneur job, as well as new Entertainer alt-title 2023-09-01 07:43:55 +10:00
Heroman db80e2cef1 Removes random burn chance from cheap lighters 2023-08-31 06:47:53 +10:00
izac112 4088f40cc9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 18:27:07 +02:00
Heroman 71e124718e Adds food vore 2023-08-22 20:12:24 +10:00
VerySoft 90981fa620 Revise OOC notes panel
Revises the OOC notes panel a bit, and removes the OOC notes panel from character setup, in favor of just adding buttons to set the likes and dislikes there, rather than maintaining two different versions of the panel.

Additionally, adds a 'print to chat' button to the panel, and to examine for the OOC notes.

Changes the way the window is sent to the client so that it behaves more like character setup. This should mitigate edge cases where the panel appears off screen when SS13 is not being displayed on the primary monitor. It SHOULD also remember its position between sessions. Either way it should stay on your screen now.

Also, for the print to chat, character directory, and any OOC notes panel that isn't yours, the LIKES and DISLIKES sections will show up conditionally depending on if they are actually set up. If there's nothing there, then they won't show up.

This is presently an imperfect revision, as it only allows you to have one OOC notes panel open at a time. I would like you to be able to have more than one at a time, while also having the features to allow it to always appear on the screen, however, that will take some extra development time.

Apart from that, this is fully functional.
2023-08-16 05:44:59 -04:00
Runa DacinoandGitHub 04c42c29de Tweak: Changes mentions to phoron from nitrogen in manual
Changes mentions of nitrogen to phoron in SM manual.

Also updates relevant numbers (expected shots of 12-16)

Expands data enabled by new features: how many moles in a canister, how to check.

Expands data on SM behaviour by mentioning EPR, gives safe window.
2023-08-11 18:09:20 +02:00
Heroman 9435db8c69 Feature completion for Dogborg Removal 2023-08-09 19:40:36 +10:00
Killian d8ec7bf887 staves2 2023-07-30 23:47:54 +01:00
Killian b966afe0a0 staves 2023-07-29 22:08:24 +01:00
Heroman eade7ffc26 Adds altevian NPCs for event use 2023-07-14 17:38:02 +10:00
Heroman3003andGitHub e047e89ba7 Merge pull request #14638 from VOREStation/upstream-merge-9002
[MIRROR] the little construction pr
2023-07-07 17:29:50 +10:00
Heroman 63e9a069be Compatibility fixes 2023-07-07 17:17:49 +10:00
VerySoft 4628e467c2 Tweaks and tidying
Adjusts some types to tidy up the mob list. Put some of the mobs that can vore under the vore tab, removed the clown mobs from /mobs_monsters because they were the only thing in there, so there wasn't really any point in hiding them a level deeper, and generally looked for subtypes that didn't have anything in them, and commented those out. Did you know that telesci is supposed to have a chance to spawn hostile mobs if you mess up? It's true! I may or may not have fixed it, I don't play telesci, but it uses a path that actually has mobs in it now.
2023-07-03 02:09:51 -04:00
izac112 ff7df50a7e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-06-21 19:03:35 +02:00
Heroman3003andGitHub 860fad8a75 Merge pull request #15043 from ItsSelis/spell-fixes-v2
Spell Fixes
2023-06-19 14:39:41 +10:00
Selis 271ff9408f Spell Fixes 2023-06-18 12:47:36 +02:00
Youtubeboy139 c8075aa901 New Belts and Accessories 2023-06-17 16:31:45 -04:00