cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-01 11:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,402 Commits 8 Branches 26 Tags
4efbfe4fcb14a5e87237e0032b60adccff202aa6
Commit Graph

31000 Commits

Author SHA1 Message Date
Heroman3003
4efbfe4fcb Merge pull request #14662 from KillianKirilenko/kk-wepdesc 
Weapon Info on Examine
 2023-03-15 04:08:50 +10:00
Heroman3003
5fbbd9791e Merge pull request #14683 from VOREStation/upstream-merge-9030 
[MIRROR] Fixes a small hiccup in cable coil examine text
 2023-03-14 18:16:21 +10:00
Heroman3003
a4789c5723 Merge pull request #14689 from VOREStation/upstream-merge-9039 
[MIRROR] Siege Hivebots Use Proper Projectile
 2023-03-14 18:16:05 +10:00
Heroman3003
9266d57e22 Merge pull request #14686 from VOREStation/upstream-merge-9033 
[MIRROR] *bing
 2023-03-14 18:13:22 +10:00
Heroman3003
1471721003 Update ranged_damage.dm 2023-03-14 18:08:41 +10:00
Heroman3003
8fa3852d5e Update ranged_damage.dm 2023-03-14 18:05:10 +10:00
Heroman3003
d59b9ac766 Update emote.dm 2023-03-14 18:03:59 +10:00
Heroman3003
0bde5eea0b Update emote.dm 2023-03-14 18:03:48 +10:00
Heroman3003
cfb42c8817 Update emote.dm 2023-03-14 18:00:37 +10:00
Heroman3003
c2a88ee632 Update emote.dm 2023-03-14 18:00:22 +10:00
Heroman3003
bdee40eb80 Update engineering.dm 2023-03-14 17:58:10 +10:00
Atermonera
c0b10f2405 Siege Hivebots Use Proper Projectile 2023-03-14 03:54:15 -04:00
Atermonera
3ad7cd8e8e *bing 2023-03-14 03:50:45 -04:00
Atermonera
def3b6c762 Merge pull request #9030 from Ilysen/if-i-dont-do-a-small-thing-here-and-there-im-gonna-melt 
Fixes a small hiccup in cable coil examine text
 2023-03-14 03:46:15 -04:00
Atermonera
f7669b64d0 Sheet storage has different caps per type. 2023-03-14 03:44:57 -04:00
Killian
c7b0ce3496 Update guns.dm 
this is totally cheating but fuck it
 2023-03-13 18:33:36 +00:00
Heroman3003
48aca7185c Merge pull request #14675 from Heroman3003/boot-no-kill 
Removes warcrimes from boots
 2023-03-13 15:25:27 +10:00
Heroman3003
21acee71bf Merge pull request #14551 from VOREStation/upstream-merge-8962 
[MIRROR] /tg/ era language pass
 2023-03-13 15:23:34 +10:00
Heroman3003
7547f7c3ce Update snacks.dm 2023-03-13 15:16:45 +10:00
Heroman3003
043b99717f Update food_drinks.dm 2023-03-13 15:12:15 +10:00
Heroman3003
6aecbcd4c2 Update reagent_tank.dm 2023-03-13 15:11:06 +10:00
Heroman3003
37fe448b52 Update snacks.dm 2023-03-13 15:10:05 +10:00
Heroman3003
9e4d056d72 Update vending_machines.dm 2023-03-13 15:08:32 +10:00
Heroman3003
e3dcf6aed1 Update miscellaneous.dm 2023-03-13 15:07:27 +10:00
Heroman3003
20a671d02a Merge pull request #14642 from VOREStation/upstream-merge-9013 
[MIRROR] Fixes Simplemob Movement Delay
 2023-03-13 14:57:46 +10:00
Heroman3003
c01fc4c7d2 Merge pull request #14643 from VOREStation/upstream-merge-9012 
[MIRROR] Fix some coffee mugs not using the correct sprites
 2023-03-13 14:57:00 +10:00
Heroman3003
600cfc7316 Merge pull request #14646 from VOREStation/upstream-merge-9014 
[MIRROR] Prometheans self clean adjust.
 2023-03-13 14:56:31 +10:00
Heroman
0cc739d63c Removes warcrimes from boots 2023-03-13 14:54:24 +10:00
Heroman3003
e07a9d6958 Merge pull request #14670 from KillianKirilenko/kk-sanitweak 
Relaxes Sanitization
 2023-03-13 14:10:42 +10:00
VerySoft
57ddc4b2f5 Squirrel 2023-03-12 23:21:01 -04:00
Killian
b38722c28b relaxes sanitization 2023-03-12 23:29:42 +00:00
Killian
f39e9f1f8c Update guns.dm 2023-03-12 21:27:19 +00:00
Killian
8db14b1b61 Update items.dm 
a little more descriptytweaks
 2023-03-12 21:22:19 +00:00
Killian
bd224a7713 Update items.dm 
melee damage descriptors
 2023-03-12 21:08:56 +00:00
Killian
445372b62e special weapon exclusions 2023-03-12 21:03:08 +00:00
Killian
66f1305e58 gun info on examine 2023-03-12 17:13:17 +00:00
peesh
8887d3ecd9 Revert "[MIRROR] Replaces Skrell sprites" 2023-03-12 20:08:18 +10:00
Killian
d85d9306df melee weapon info on examine 2023-03-12 03:12:21 +00:00
Heroman
a7ac53831f Fixes MRE unpacking and Intercom Convo 2023-03-12 06:41:32 +10:00
VerySoft
cf5fe2b39d angy 2023-03-10 16:28:58 -05:00
VerySoft
3958a9dcad Concerning stars 2023-03-10 15:52:42 -05:00
Heroman3003
44a53d2dba Merge pull request #14581 from Runa-Dacino/autoinjectorfix 
fixes small injectors not working from printer
 2023-03-10 16:51:27 +10:00
Heroman3003
0eb2f82d41 Merge pull request #14649 from Seris02/prmirror 
cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else
 2023-03-10 16:48:20 +10:00
Casey
db38041456 Merge pull request #14641 from Heroman3003/admin-perm-fixes-also-sound 
Fixes some admin perms not being properly checked
 2023-03-09 15:33:21 -05:00
Seris02
ab49b853ec delete file 2023-03-09 17:40:51 +08:00
Seris02
d2764f4c46 fix closing tag 2023-03-09 17:29:21 +08:00
Seris02
0cdc45eddf merge conflict fixes for chat filters PR 2023-03-09 17:19:02 +08:00
Heroman3003
6b15a22b69 Merge pull request #14630 from KillianKirilenko/kk-mini2 
NIF damage minitweak
 2023-03-09 15:22:12 +10:00
Heroman3003
d0b7833c37 Merge pull request #14519 from VOREStation/upstream-merge-8944 
[MIRROR] allows animations to be toggled in preferences
 2023-03-09 15:21:47 +10:00
Heroman3003
ac1782cc4d Merge pull request #14624 from ItsSelis/selis-sdmm 
Resolves SDMM warnings
 2023-03-09 15:19:56 +10:00