izac112
aa8016bddd
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2025-01-14 02:20:30 +01:00
Kashargul and GitHub
59b9802628
some istype to macros ( #16826 )
2025-01-06 06:45:02 +10:00
izac112
5a63e93153
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-12-28 14:43:02 +01:00
Kashargul
8d6bf161a8
cleanup the last
2024-12-08 20:54:28 +01:00
Kashargul
2bd0f9c14d
other.dm
2024-12-07 00:12:42 +01:00
Kashargul
0b303a3ae5
bunch of fixes
2024-12-06 23:29:36 +01:00
Kashargul
429398bdd7
some moire
2024-12-06 21:54:05 +01: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
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
Kashargul
49d89c0059
usr to user up to player effects
2024-11-12 00:10:20 +01:00
Killian
44f643b13d
Merge remote-tracking branch 'upstream/master' into kk-rings
2024-11-10 15:12:24 +00:00
Kashargul and GitHub
6c8fa2dba1
maptest redgate ( #16579 )
...
* maptest redgate
* .
* .
* .
* .
* .
2024-11-09 15:42:44 +01:00
Killian
9fff34e6ad
attachable knuckledusters and force transfer
2024-11-07 03:06:56 +00:00
Nadyr and GitHub
5a5c59ac74
makes ashtrays visible in SDMM ( #16570 )
2024-11-06 14:21:18 +01:00
Kashargul and GitHub
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
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
izac112
42b345b3cc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-08-28 20:22:38 +02:00
Kashargul and GitHub
4837819a14
some RS ports
2024-08-14 23:29:47 +02:00
izac112
04de351a1e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-07-17 16:14:16 +02:00
Kashargul and GitHub
ab31632830
even more local defines ( #16033 )
2024-06-12 12:57:31 +10:00
izac112
186475ef6d
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-06-03 22:08:11 +02:00
DigitalSquirrel95 and GitHub
4d8118f7d7
Reduces ashtray size ( #15987 )
2024-05-22 04:50:24 +10:00
izac112
153c3abf2e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-26 03:37:23 +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
9402b12322
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-08 18:19:52 +01: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
Nadyr and GitHub
9347a99f5b
Ports QoL, upgrades, and a lot of bug fixes
2024-01-18 21:04:36 -05: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
izac112
4088f40cc9
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-08-24 18:27:07 +02:00
Heroman
71e124718e
Adds food vore
2023-08-22 20:12:24 +10:00
Killian
d8ec7bf887
staves2
2023-07-30 23:47:54 +01:00
Killian
b966afe0a0
staves
2023-07-29 22:08:24 +01:00
izac112
4cc81d7c73
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-03-19 22:24:48 +01:00
Killian
d85d9306df
melee weapon info on examine
2023-03-12 03:12:21 +00:00
izac112
53f54d78e6
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-01-03 21:12:41 +01:00
Heroman3003 and GitHub
f3a28c1c3d
Update shards.dm
2022-12-14 07:46:38 +10:00
Spookerton and VirgoBot
f6f5a7e1f9
Fixes shards having unlimited afterattack range
2022-12-13 16:25:49 -05:00
izac112
dc36fe9b8f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-10-16 22:52:41 +02:00
69b99194c5
[MIRROR] Concealed Cane Sword (ABLE TO BE MERGED) ( #13089 )
...
* Concealed Cane Sword
* Update stealthy_weapons.dm
* Update canes.dm
* Update canes.dm
* Ports weapon.dmi sprites from Polaris
* Update swords.dm
* Update swords.dm
* Update canes.dm
Co-authored-by: Atermonera <atermonera@gmail.com >
Co-authored-by: C.L <killer65311@gmail.com >
2022-09-22 21:04:24 -04:00
izac112
00994205e0
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-09-05 13:47:14 +02:00
Heroman
a07ada635f
Fixes whetstone runtime
2022-09-04 11:27:32 +10:00
Novacat and GitHub
1aa4c73e8d
Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]"
2022-08-27 08:49:56 -04:00
MistakeNot4892
d717a4b50a
Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8298
2022-08-25 14:26:20 +10:00
izac112