Commit Graph
1104 Commits
Author SHA1 Message Date
izac112 aa8016bddd Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2025-01-14 02:20:30 +01:00
KashargulandGitHub 59b9802628 some istype to macros (#16826) 2025-01-06 06:45:02 +10:00
SelisandGitHub ee8fe38a8a Enables SHOULD_CALL_PARENT for datum Destroy proc (#16828) 2025-01-05 00:28:58 +01:00
izac112 5a63e93153 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-12-28 14:43:02 +01:00
izac112 f3e3905b41 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-12-11 20:18:19 +01:00
KashargulandGitHub a88c58dde7 Merge branch 'master' into reagentToDefines 2024-12-08 15:41:21 +01:00
Killian ef78be37ce space traffic updates 2024-12-08 08:00:55 +00:00
Kashargul e9550345d2 half of the food and drinks 2024-12-08 01:14:10 +01:00
Kashargul 1d8d5b34b5 medicine.dm 2024-12-07 02:10:10 +01:00
Kashargul 2bd0f9c14d other.dm 2024-12-07 00:12:42 +01:00
Kashargul 429398bdd7 some moire 2024-12-06 21:54:05 +01:00
Kashargul 80edcd2c3d Converts gas, mat and reagent strings to defines 2024-12-06 17:26:00 +01:00
izac112 87ce13b27c Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2 2024-12-04 15:17:00 +01:00
Killian e9aafd2826 Merge remote-tracking branch 'upstream/master' into kk-spacetraffic 2024-12-02 06:08:55 +00:00
Killian 9d3a7986d8 traffic update
more khi cleanup
2024-12-01 18:37:08 +00:00
izac112 a2ad915045 Device and weapon 2024-12-01 00:56:26 +01:00
izac112 058f219cb9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-11-30 23:30:26 +01:00
Heroman3003andGitHub 8d675e86e7 Merge pull request #16616 from Kashargul/things
some accessories
2024-11-28 14:38:12 +10:00
Kashargul 938ab8af7c Merge branch 'master' of github.com:Kashargul/VOREStation into usr-to-user-up-to-player_effects 2024-11-27 23:53:06 +01:00
KashargulandGitHub bc8d817ed3 surgery firstaid bags can carry bone clamps 2024-11-22 00:01:04 +01:00
KashargulandGitHub a5e910bfd2 makes no more sense otherwise 2024-11-17 23:57:06 +01:00
Heroman3003andGitHub 8d24db7be4 Merge pull request #16512 from Darlantanis/OreGrinding
Ports grindable ores
2024-11-17 20:58:33 +10:00
Kashargul 49d89c0059 usr to user up to player effects 2024-11-12 00:10:20 +01:00
GutiandGitHub 9077c940c4 Better Viro (#16536)
* Better Viro

* Quarantine ship

* Lazy...

* Roanoake prep

* Roanoake

* Verbs

* Verbs + Logging

* Virus breath check
2024-11-05 12:40:02 +01:00
Nadyr ba998786d7 grindable ores, more grindable stacks, blacklisted slag 2024-10-22 21:19:23 -04:00
KashargulandGitHub 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
Heroman3003andGitHub 6ebd6bc8ec Merge pull request #16406 from TankTheBirb/heft-them-bags
lightens the slowdown from chemistry bags
2024-10-04 18:48:59 +10:00
Kashargul a2c673ab7a refactors most spans 2024-10-02 21:10:31 +02:00
TankTheBirb 5424fd8dbd lightens the slowdown from chemistry bags
PR awaiting staff commentary or approval to revert a past PR that makes chemistry bags super slow to lug around. I reverted it back to slowdown = 1 but if this results in janky behavior I can also just remove the slowdown.

afaik the original reason for increasing the slowdown was due to undesirable player behavior but I'm pretty confident the culture has shifted all around to make this no longer necessary and kinda just weird. The engi is zooming by pulling a full shield generator meanwhile an empty chem bag is slowing you down to a brisk crawl.

🆑
balance: changes chemistry bag slowdown to 1 from 3
/🆑
2024-10-02 00:25:06 -04:00
Kashargul e0d694e8ac rid of old span macros 2024-10-01 23:51:48 +02:00
Guti f2d6e7c639 Damn recording tapes 2024-09-29 00:14:13 +02:00
Guti f4f5476121 Merge branch 'master' into weapon-removal 2024-09-18 18:07:43 +02:00
Kashargul 8a90ae6523 only missing alt titles 2024-09-12 22:48:14 +02:00
Guti 409aaba802 Remove 2024-09-09 02:36:53 +02:00
NadyrandGitHub 06c5c8cee4 Update belt.dm
removes duplicate syringe case
2024-09-03 17:10:38 -04:00
Nadyr eff6c5749c September 2024 adds, QoL and fixes 2024-09-02 23:12:15 -04:00
izac112 42b345b3cc Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-08-28 20:22:38 +02:00
NovacatandGitHub 2c796c4010 Adminbus and Shelter Capsule Updates (#16191)
* Adminbus and Shelter Capsule Updates

- Adds weapon cell boxes, which contain 7 weapon cells. For now adminbus only.
- ERT Ship gets a couple denecrotizers, reinforced insulated gloves, weapon cell boxes, and a minor bugfix
- Updated an adminbus deployable dropship
- Updated uplinks with reinforced insulated gloves and weapon cell boxes
- Fixes a load error with Ascian's shelter capsule, adds a missing health analyzer
- Adds Survival Watch and Emergency Beacon to Luxury Shelter Capsule and Ascian's Shelter capsule
- Replaces Escape Pod shelter capsule in the Curious Coin trader with a Frontier Translocator

* Fixes accidental double commas

* Casino spawner nade adjustments

* Buffs the Dropship's SMES

* Updates Shelter capsule medical supplies
2024-08-18 20:40:36 +10:00
izac112 186475ef6d Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-06-03 22:08:11 +02:00
KillianandGitHub 1ecef5a6b4 Fluff Permits in Wallets (#16000)
* Update wallets.dm

* Update wallets.dm
2024-05-23 06:00:04 +10:00
Heroman3003andGitHub bf490b78ac Adds Contaminant Detector HUD (#15970) 2024-05-09 19:37:19 +10:00
izac112 95279d346e Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-515 2024-04-24 23:28:19 +02:00
Heroman3003andGitHub da8c2d7a43 Revert "Revert "Garbage collection, asset delivery, icon2html revolution, and…" (#15816) (#15937)
This reverts commit f6d0f62622.
2024-04-22 06:31:52 +10:00
Heroman3003andGitHub c7b6c3e42b Revert "Revert "Garbage collection, asset delivery, icon2html revolution, and…" (#15816)
This reverts commit f6d0f62622.
2024-04-22 06:29:01 +10:00
Heroman3003andGitHub f6d0f62622 Revert "Garbage collection, asset delivery, icon2html revolution, and general…" (#15815)
This reverts commit cc05d51b69.
2024-03-10 20:01:05 +10:00
cc05d51b69 Garbage collection, asset delivery, icon2html revolution, and general fixes (515) (#15739)
* Making it compileable

* Adds Tracy & Fixed missing compat in sorting code

* CI workflow using "Stable" beta version

* Tracy define

* Fixes

* Update GC from TGStation

* fixes

* Appease linter

* begone custom_items.txt

* Making it compileable

* Adds Tracy & Fixed missing compat in sorting code

* CI workflow using "Stable" beta version

* Tracy define

* Fixes

* Build dependencies at 514

* Asset delivery/GC/515 megapatch

* fix runtime

* Appease integration tests

* More runtime fixes

* Attempting to resolve runtime

* Update spacemanDMM

* icon2html revolution

* icon2html part 2

* fixes

* Attempt to appease linter

* More fixes

* Final fixes (hopefully)

* operator keyword moment

* minor fixes and additions

* undo extra tgui files

* switch to QDEL_IN_STOPPABLE where necessary

* Pain

* GPS runtime

* dropped(null) fix, + chompedit the fixes just incase.

* Fix chat tags

* Update _build_dependencies.sh

* runtime in orebag, duplicate in computer/ship/proc/look, runtime in zoom

* tweak zoom change

* another registersignal override runtime

* 1

* Revert "1"

This reverts commit 43f619ca6c216c2bc41b8f7a346069f99591261b.

* various qdel ref fixes

* newplayer and observer harddels

* disposalholder logging remove, gargoyle hard del + typo

* retouch atom/movable destroy to be TG-like

* potential edge case ref in manualfollow

* extra following potential ref

* global list refs tweak, new_player undo a thing

* /mob/new_player qdel fixes

* undo some things

* revert atoms/movable/destroy

* revert mind and new_player panel changes

* atoms and atom/movable reversions

* bring back datum/mind and panel fixes

* projectile optimisation

* Reverts useless edits, clothing hood runtime, projectile runtime

I tried a lot of things which do not help, and i reverted a lot of it here.

* a few more reversions of useless changes

* Begin getting rid of CHOMPedit comments

* Nuke remaining chompedit comments

* Revert "undo extra tgui files"

This reverts commit f3bdcde8cbd846adcfbc6f02b0077e0c5ae20f56.

* fixing oops

* line ending shenanigans

* More GC cleanup

* Optimisations to test/trace projectile, turrets. Tweaks.

Turrets now only trace when they are absolutely sure they want to shoot. disposalholder, effect master and artefact qdel refs changes.

* bad usage of the check_trajectory proc

check_trajectory returns a list of objects hit along it's path to it's target, not a boolean of the target being hittable. a couple places in code assume this, so here they are fixed.

* puts legacy globals into GLOB datum for debug use

* fix upport oopsie

* fix

* Move recursive listening to component

* Minor fixes and cleanup

* undo my temp solution

* tweaks + a missed thing

* recursive_move sanity checks and safety cases

* Catch null initialisation cases + fix borg creation

VV edit spawns the object in nullspace then directly sets it's loc, which means the movement is unregistered. The spawn(0) delay should hopefully mean that setup_parents happens AFTER any unregistered movement.

* circular inventory check, make checks better

* better handling of safety reset cases

* Add logging to safety checks

---------

Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2024-03-10 09:39:33 +10:00
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 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