2760 Commits
Author SHA1 Message Date
izac112 f3e3905b41 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-12-11 20:18:19 +01:00
Killian 525905a086 traffic updates 2024-12-06 22:19:57 +00: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 058f219cb9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-11-30 23:30:26 +01:00
Kashargul 49d89c0059 usr to user up to player effects 2024-11-12 00:10:20 +01:00
4879a52633 Server maint subsystem (#16518)
* upports server maint subsystem

* fix runtime in admin z narrate

* .

* sorts them verbs

* .

* .

* Update code/controllers/subsystems/statpanel.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/controllers/subsystems/server_maint.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

---------

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
2024-11-04 11:44:44 +01:00
ShadowLarkensandGitHub dc3fd79427 The final action buttons PR (#16514)
* Make action button target datum

* Initial working action palette

* Action related refactors

* tgstation/tgstation/pull/71339
2024-10-26 13:20:54 +02:00
242fa3a66b Ports over configuration controller (#16484)
* Ports over configuration controller

* Fixes

* Manual path fix

* patch (#16490)

* patch

* .

* SQL Fix

* Post-rebase fix

* Added missing examples

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2024-10-22 19:26:44 +02:00
ShadowLarkensandGitHub bcc107c7cd Ports tgstation/tgstation/pull/15673 (#16495)
* Ports tgstation/tgstation/pull/15673

* Add a small delay to icon updating to cover up SSoverlays

* Fix actions on robot modules
2024-10-20 17:12:24 +02: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
c07027136e Port tg statpanel (#16463)
* Port tg statpanel

* Add verb descriptions using the title attribute

* Fix a dreamchecker error

* Remove chomp edits

* Add mentor tickets to ticket panel

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2024-10-16 19:39:06 +02:00
Guti b6e27b3358 Restores the sounds for all the items 2024-10-07 19:37:23 +02:00
Kashargul b5ac881283 some more spans 2024-10-05 07:27:53 +02:00
Kashargul d40bfe9d08 also fix those 2024-10-04 23:03:01 +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 f4f5476121 Merge branch 'master' into weapon-removal 2024-09-18 18:07:43 +02:00
Kashargul 7fa41d248f alt titles and order 2024-09-14 04:20:37 +02:00
Kashargul a123f87e68 some mind jobs 2024-09-12 23:48:31 +02:00
Kashargul 8a90ae6523 only missing alt titles 2024-09-12 22:48:14 +02:00
Kashargul 4ba7beeb9c up to field medic 2024-09-12 21:20:47 +02:00
Kashargul 8a3520e2e0 move all factions to defines 2024-09-12 20:17:41 +02:00
Kashargul 10dc8510b3 up to engineer 2024-09-12 02:01:36 +02:00
Kashargul 0425a4e396 up to officer 2024-09-12 00:00:11 +02:00
Guti 409aaba802 Remove 2024-09-09 02:36:53 +02:00
KashargulandGitHub 2f19f66cc5 default tgui alert input handling (#16241)
* default handling

* do not push that

* fix

* .

* .
2024-09-02 04:27:26 +10:00
izac112 04de351a1e Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-07-17 16:14:16 +02:00
KashargulandGitHub ab31632830 even more local defines (#16033) 2024-06-12 12:57:31 +10:00
izac112 f609ac8565 Merge branch 'release' of https://github.com/VOREStation/VOREStation into vore-update 2024-04-02 17:26:31 +02:00
KashargulandGitHub 496cff40ff fixes broken chars (#15810) 2024-03-05 23:33:23 +01: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
KashargulandGitHub 8c3d15a68b typo 2024-01-31 11:46:41 +01:00
KashargulandGitHub 0d77816c04 fix some more font tags 2024-01-30 16:14:02 +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
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
izac112 4088f40cc9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 18:27:07 +02:00
Heroman3003andGitHub cb2b31f556 Merge pull request #15250 from Runa-Dacino/bloodfix
Fixes human mobs ending up with their blood datums deleted, creates fallback if that still happens
2023-08-19 08:12:31 +10:00
Runa Dacino 09acdfd922 fix(blood): Modifies remove_reagent calls to remove_blood calls
Fixes https://github.com/VOREStation/VOREStation/issues/14817

remove_reagent has no sanitization for making sure the person has at least 1 u of blood remaining, and is therefore unsafe to use.

This commit changes all human remove_reagent("blood", amt) calls with remove_blood(amt).

This should prevent blood disappearing from internal bleeding or dragging someone while they're down or from drawing blood from them and so forth.

Not all cases of remove_reagent("blood", amt) were changed, as some act on organs or other reagent containers not part of a human mob or because it's set_species
2023-08-13 20:08:17 +02: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 b5ad497ac0 538 2023-08-02 05:38:52 -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
ItsSelis 10d2178516 More 515 Compatibility 2023-06-05 19:29:40 +02:00