Commit Graph
1912 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
Selis d99321bfdf Cleaning up defines 2024-02-10 16:44:44 +01:00
izac112 9402b12322 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-08 18:19:52 +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 1444a224a3 missed tags 2024-01-21 12:44:12 +01:00
Kashargul e4b62dfa35 remove static chat colour tags 2024-01-21 12:34:53 +01:00
Eli 4d61d0d1e7 SleeveMate Emag action 2024-01-08 18:51:41 +11:00
izac112 c8a8aa3c12 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-01-01 20:28:55 +01:00
KashargulandGitHub cf8d3dde40 we can't quite listen in without the encryption allowed 2023-12-31 08:46:43 +01:00
izac112 eddb283c11 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2023-12-18 03:17:20 +01:00
Heroman3003andGitHub 864248da9b Merge pull request #15424 from KillianKirilenko/kk-laserdome
Redgate Laserdome
2023-12-03 11:07:22 +10: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 eb1311b7ef laserdome updates
adds entertainment radio key, amongst other things
2023-09-26 18:21:12 +01:00
Killian 8ce5d24277 blood reagents refactor 2023-09-12 20:17:23 +01:00
Heroman3003andGitHub 94986e7426 Merge pull request #15361 from Runa-Dacino/zorrencopper
Makes Zorren blood actually based on copper: Iron no longer regens their blood, copper is needed
2023-09-10 08:57:38 +10:00
Runa Dacino eca94f7854 tweak(species/chemistry): Makes zorren need copper for blood
Changes iron reagent to no longer regenerate copper for zorren
Changes copper reagent to regenerate blood for zorren
Adds IS_ZORREN reagent_tag define and applies it to species
Updates medical scanner guide to recommend using copper for zorren and skrell
2023-09-07 15:24:27 +02:00
SatinIsle 9d7a1329e0 Redgate train map
Adds a new redgate map: A moving train. A long, linear map with two levels, all aboard a moving train. Has a few things to find and mobs to eat/get eaten by. lots of different rooms, mostly to vibe in. Very very deadly to fall off of, but has railings everywhere except one roof section.

Adds a new death step_trigger, which deletes the body of the person who steps on it and gives them a message about how they died. Also logs and messages the admins so that it can be tracked easily.

Adds a new subtype of ticket printer, which prints permits instead, only little pink tickets. Idea is for them to be used for train tickets if someone wanted to RP a train conductor, but made them broad so that they can be used for anything. Does not add the message to the end of round report, but does notify the staff when a ticket is produced to prevent abuse.
2023-09-05 13:25:10 +01:00
izac112 4088f40cc9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 18:27:07 +02:00
Killian 64590b4f0f emergency beacon 2023-08-18 13:46:25 +01:00
CaseyandGitHub 84d239d6ed Merge pull request #15229 from Very-Soft/oocnotes
OOC notes panel
2023-08-11 03:57:20 -04:00
VerySoft fdab4990ce OOC notes panel 2023-08-11 02:10:38 -04:00
Heroman3003andGitHub 93082debc0 Merge branch 'master' into dogborg-end 2023-08-07 20:05:05 +10:00
Heroman 67b14352af Borg module consolidation - initial commit 2023-08-06 20:55:34 +10:00
VerySoft 5357972b74 Final 2023-08-03 22:42:34 -04:00
Runa Dacino c42048e083 fix(TGUI): Fixes Communicator Weather app gibberish
fixes https://github.com/VOREStation/VOREStation/issues/15093
2023-07-17 16:05:26 +02:00
PastelPrinceDan 92a072093e typo/mispelling fixes 2023-07-06 00:13:33 +01:00
Heroman3003andGitHub 06e8bcf186 Merge branch 'master' into healthanal 2023-07-05 16:53:11 +10:00
Heroman 163725908d Also lowers brain damage threshold 2023-07-05 16:51:48 +10:00
Heroman 8d8985d70e Health Analyzer post-guidance improvements 2023-07-05 16:48:48 +10:00
VerySoft ec123361ad Medical guide addition
Per suggestion
2023-07-05 01:14:05 -04:00
VerySoft d59c97e568 yaba daba doo 2023-07-04 19:11:09 -04:00
VerySoft eabbb90d72 use the big scanner 2023-07-04 18:19:31 -04:00
VerySoft 1c3d5834e0 Oh this one too 2023-07-04 18:08:35 -04:00
VerySoft a36a244dfc Guide 2023-07-04 18:08:17 -04: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
Selis 271ff9408f Spell Fixes 2023-06-18 12:47:36 +02:00
Heroman3003andGitHub 424749de03 Merge pull request #14941 from Youtubeboy139/Suit-Cooler
Time to cool off
2023-06-10 08:40:07 +10:00
ItsSelis 10d2178516 More 515 Compatibility 2023-06-05 19:29:40 +02:00
Heroman3003andGitHub 13c8f6a7bd Merge pull request #14725 from VOREStation/upstream-merge-8950
[MIRROR] Fixing Tape Recorder Voices
2023-06-04 07:10:15 +10:00
Heroman3003andGitHub 2a3d1c14b0 Update taperecorder.dm 2023-06-04 07:02:30 +10:00
Youtubeboy139 64016db1b0 New Suit Cooler Sprite 2023-06-02 01:20:19 -04:00
ItsSelis 0680645556 Weakref refactor 2023-06-01 20:31:54 +02:00
SharkmareandVirgoBot 94b9e2fa8c Fixing Tape Recorder Voices 2023-03-23 23:09:44 -04:00
izac112 4cc81d7c73 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-03-19 22:24:48 +01:00
Heroman3003andGitHub 21acee71bf Merge pull request #14551 from VOREStation/upstream-merge-8962
[MIRROR] /tg/ era language pass
2023-03-13 15:23:34 +10:00
Heroman3003andGitHub a236ff66ea Update flash.dm 2023-03-13 14:59:53 +10:00