izac112
153c3abf2e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-26 03:37:23 +01:00
izac112
578e38108f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-25 19:31:25 +01:00
Drathek and GitHub
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
Kashargul and GitHub
59d751a9f9
Round value adjustments for react ( #15764 )
...
* input adjustments
* .
* .
2024-02-16 14:18:54 +01:00
Kashargul and GitHub
c9c281f8d7
accidental resets ( #15767 )
2024-02-16 12:00:56 +01:00
Selis
2fdb69ab5c
Some input updates
2024-02-12 23:33:37 +01:00
Nicolas Suarez and GitHub
d52ed7ff5e
Merge branch 'master' into monty/character-export
2024-02-10 23:34:08 -06:00
Montessquio
5bf6e29acc
Add save export functionality.
2024-02-10 22:15:06 -06:00
izac112
9402b12322
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-08 18:19:52 +01:00
Runa Dacino and GitHub
5780dc85f2
Merge branch 'master' into PDAthing
2024-02-08 16:14:43 +01:00
Runa Dacino
e3f3e416b8
adds: gm tool for creating prop pdas convo for events
...
* Creates new proc in pda/messenger.dm to handle fake conversation creation
* Creates new eventkit datum and holder var on client for remembering identitities
* Creates new proc as eventkit R_FUN verb for managing prop identities
* Creates new proc on pda to create a fake event prop conversation in new eventkit
* Creates new topic in admin/view_variables/topic.dm and helper.dm to call new proc on pda
2024-02-08 16:08:18 +01:00
Heroman3003 and GitHub
82812ea2e6
Merge pull request #15733 from BonniePandora/Replikant
...
Ports various clothing items, two sets of cyberlegs & some markings
2024-02-08 03:56:39 +10:00
PastelPrinceDan
373bb64cc7
adds 1 outfit, port 1 pair of ears, fixes 2 hairs
2024-02-07 12:23:13 +00:00
Montessquio
163523c9a7
Add pref export boilerplate
2024-02-06 16:55:00 -06:00
BonniePandora
d561f31319
Replikant stuff
...
Items, robolimbs & markings
2024-02-06 00:25:50 +00:00
Kashargul and GitHub
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
Repede
aaf6f905b3
typo fix
2023-12-30 16:24:05 -05:00
Repede
0a98f39972
Event medals refactor
2023-12-30 15:18:24 -05:00
Repede
675afd5ae9
Event medal fluff items for 6 crew
2023-12-30 14:46:51 -05:00
izac112
2fdeac8c38
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2023-12-28 09:22:14 +01:00
dafsu
0bf27bc4b2
code
2023-12-22 20:59:10 +03:00
Kashargul and GitHub
4ce06ee440
fixes and filters ( #15626 )
...
* fixes and filters
* remove the missed closing spans
* bundle added
* we also store empty hihglighting
* change the blacklist handling
* fix custom links in examine
* regenerate bundle
* automatic URL parsing for OOC/LOOC
2023-12-21 00:30:12 +01:00
izac112
eddb283c11
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2023-12-18 03:17:20 +01:00
Heroman3003 and GitHub
7efdcc7724
Merge pull request #15595 from PastelPrinceDan/spritesandoveralls
...
underwear & clothing sprite fixes + edits
2023-12-13 14:58:38 +10:00
Kashargul and GitHub
4045122207
fixes custom admin colours ( #15598 )
2023-12-11 10:03:52 +01:00
PastelPrinceDan
5af5557f5e
sprite fixes + edits + loadout add
2023-12-11 03:57:40 +00:00
Heroman
67026e62e4
Adds 'default' option for bloodreagents
2023-12-09 14:27:50 +10:00
Selis
513d650faa
Bundle & Text Tags in oldchat
2023-12-08 18:01:27 +01:00
Selis
a4639e90be
oldchat pref
2023-12-08 17:26:05 +01:00
ItsSelis
09b3d544ca
Misc adds and changes
2023-12-08 17:25:54 +01:00
Selis
0054048e5e
Implement https
2023-12-07 20:48:08 +01:00
PastelPrinceDan
0065dccc1b
clothes and hair and even a tail oh wow
2023-12-06 07:53:18 +00:00
Killian
8f65da3b9f
PDA ringtone QOL
2023-12-04 09:03:58 +00:00
Heroman3003 and GitHub
aca2ba9ccf
Merge pull request #15521 from KillianKirilenko/kk-mini3
...
Jobfuscate!
2023-12-03 11:06:44 +10:00
Heroman3003 and GitHub
554901c147
Merge pull request #15551 from TheToaster98/QuickLoadoutFix
...
Adds several extra EMT overwear pieces to loadout
2023-12-02 13:27:57 +10:00
TheToaster
7ef10ea8de
Adds several extra EMT overwear pieces to loadout
...
Adds one or seven EMT/medical jackets, coats, vests and others to the loadout, also tries to put them together in a single list.
Tested and working properly, unless I mess up the PR.
2023-11-30 19:49:21 +01:00
Killian
4e7bcfb7ba
Revert "Update 03_body.dm"
...
This reverts commit 1ea1da8c25 .
2023-11-30 17:39:24 +00:00
Killian
e50cbbe56e
pda ringtone pref
2023-11-30 17:38:26 +00:00
Killian
0558d90819
Merge remote-tracking branch 'upstream/master' into kk-mini2
2023-11-30 16:57:40 +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
Killian
1ea1da8c25
Update 03_body.dm
...
mmi/cyberbrain for meat bodies
2023-11-25 20:38:59 +00:00
Selis
ae70205eae
tgchat part 1
2023-11-20 13:58:41 +01:00
Killian
1fbd1edf88
jobfuscate, director's cut
2023-11-17 20:36:01 +00:00
Killian
f154c237e3
Merge remote-tracking branch 'upstream/master' into kk-mini3
2023-11-17 11:56:41 +00:00
Killian
8b69e10edb
scaling center up-port
2023-11-13 21:23:41 +00:00
Casey and GitHub
74c3fcd2c7
Merge pull request #15510 from FunnyCatEnjoyer/FunnyCat2
...
Adds the vintage PDA
2023-11-12 21:59:26 -05:00
Guy
1e6a124f23
Adds the vintage PDA
2023-11-08 13:05:02 -03:00