Commit Graph
81 Commits
Author SHA1 Message Date
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
ShadowLarkensandGitHub 5a47c9b8a1 Check for 516 byond:// hrefs (#16359)
* Add a lint to check for hrefs that don't start with byond://

* Regex convert href links

* Regex convert _src_ as well

* Clean up the last few

* Missed a few
2024-12-11 08:33:17 +10:00
Killian ef78be37ce space traffic updates 2024-12-08 08:00:55 +00: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
izac112 058f219cb9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-11-30 23:30:26 +01:00
Killian 5d854f0c76 traffic update 2024-11-11 20:41:43 +00: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
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
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 409aaba802 Remove 2024-09-09 02:36:53 +02: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 19e46d19b2 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-17 01:06:24 +01:00
KashargulandGitHub 33be231668 removing vr file 2024-02-04 15:07:08 +01:00
KashargulandGitHub 649415c4ad wrong icon location fix 2024-02-04 15:01:38 +01:00
izac112 4088f40cc9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 18:27:07 +02:00
izac112 ff7df50a7e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-06-21 19:03:35 +02:00
Selis 796cc1a23f oop 2023-06-19 00:28:57 +02:00
Selis 271ff9408f Spell Fixes 2023-06-18 12:47:36 +02:00
ItsSelis 0680645556 Weakref refactor 2023-06-01 20:31:54 +02:00
izac112 38a1109e5d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-08-15 17:26:15 +02:00
Heroman 144a973693 Altevian base code implementation 2022-07-30 05:20:53 +10:00
izac112 d841463eb5 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-04-27 16:11:36 +02:00
Heroman 383c356312 Adds gradual sizegun 2022-04-24 16:40:42 +10:00
izac112 c53dd6ea2a Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-01-31 08:24:06 +01:00
Heroman ccf337a0a5 Fixes wrong place to put lore 2022-01-22 13:57:50 +10:00
izac112 4e14241cb8 Voreupdate 2021-07-21 15:16:48 +02:00
Aronai Sieyes 34982728cb Add 'as anything' to various for loops 2021-07-20 12:39:59 -04:00
izac112 24460868c5 Lore fixy 2021-07-16 10:05:37 +02:00
izac112 fdff893613 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-05-11 00:22:20 +02:00
klaasjared 88c97e3469 Another fix 2021-04-29 12:45:48 -04:00
klaasjared a6cdbe1899 Adds the new Compact Cataloguer Sprites
Adds the code and sprites for the new Compact Cataloguer
2021-04-29 12:35:54 -04:00
klaasjared 479cf6c053 Adds new Cataloguer sprite
I have no self control
2021-04-28 01:53:32 -04:00
izac112 8faa13454f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-04-21 11:11:09 +02:00
Unknown 8127446721 Fixes typo 2021-04-19 12:11:36 -04:00
Unknown 627faca389 Updates Cataloger Entries 2021-04-19 11:26:30 -04:00
izac112 9044c9da02 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-04 00:15:48 +02:00
Unknown 3fe46bbf8d Unlimited Credit Sharing Range
It is bad for someone to miss out on points because they were 16 tiles away instead of 14.
2020-08-03 14:49:24 -04:00
izac112 dd22d0093c fixes 2020-06-17 04:36:50 +02:00
izac112 4864ad384d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-17 04:30:06 +02:00
Killian bd50595244 improved traffic, take two 2020-06-10 22:26:23 +01:00
izac112 e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Aronai Sieyes 09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112 e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
2020-05-06 21:53:03 +02:00
NovacatandGitHub 3eaa2ad9fa Lore Overhaul (#7493)
* Lore Overhaul

* Further Updates

* Changes the year

* Reverts unedited files adds Dragor's file

* Fixes compile error

* Spelling error

* Fixfix

* Comma fixes!

* Parenthesis fix

* Removes Virgov references

* Purges remnants of UC

* Recommended Change

* More consistent naming
2020-04-29 19:59:03 -04:00
Repede e44e346352 Release Update
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
2020-04-16 21:07:33 -04:00