cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 04:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,814 Commits 8 Branches 26 Tags
94a7b2ebe4edc75a2d07ea00c71a4eef8a6945e6
Commit Graph

45495 Commits

Author SHA1 Message Date
radiantAurora
94a7b2ebe4 Update sprite_accessories_extra.dm 2023-01-06 21:31:30 +00:00
Heroman3003
1b14408271 Merge pull request #14303 from faaaay/hoodie-fix 
fixes "hoodie with hood" loadout option
 2023-01-06 06:25:57 +10:00
faaaay
b976d2052a adds ..() 2023-01-05 20:10:05 +00:00
Heroman3003
79f7d467f2 Merge pull request #14285 from Detective-Google/halos 
adds halos to loadout
 2023-01-05 05:32:50 +10:00
Detective-Google
cce8ddc020 buh 2023-01-04 08:32:46 -06:00
Heroman
655116c3d1 Fixes personal lockers robbing borgs of their modules 2023-01-04 15:59:46 +10:00
Heroman3003
0504b544ed Merge pull request #14290 from VOREStation/upstream-merge-8851 
[MIRROR] Maintenance on Hydro code, specifically vines and bees.
 2023-01-04 12:55:59 +10:00
VerySoft
5a3d0aa09b This too 2023-01-03 17:01:55 -05:00
Casey
9faf154bbb Merge pull request #14294 from Heroman3003/roaming-wildlife 
Replaces RP's carp, drone and jellyfish events with new Roaming Wildlife event
 2023-01-03 16:55:29 -05:00
Heroman
e41151bef1 Conflict resolution 4 2023-01-04 07:40:16 +10:00
Heroman3003
3990defee2 Conflict resolution 3 2023-01-04 07:34:57 +10:00
Heroman3003
45240e586b Conflict resolution 2 2023-01-04 07:33:04 +10:00
Heroman3003
c2c23f6677 Update seed_gene_mut.dm 2023-01-04 07:31:59 +10:00
Heroman3003
5e0cdce3a8 Conflict resolution 1 2023-01-04 07:31:18 +10:00
Heroman3003
485173c5fa Merge pull request #14286 from BonniePandora/Funny-synth-leggies 
New synth-style legs
 2023-01-04 07:25:28 +10:00
Heroman3003
19a423dfa6 Merge pull request #14289 from faaaay/color-stalk 
Colourable gazer eyestalks
 2023-01-04 07:23:40 +10:00
Heroman
68981659fa Replaces RP's carp and jellyfish events with new Roaming Wildlife event 2023-01-03 19:38:32 +10:00
Heroman3003
d069cb732f Merge pull request #14291 from VOREStation/upstream-merge-8867 
[MIRROR] fixes augment implants so you can't spam the fuck out of them
 2023-01-03 16:53:55 +10:00
Heroman3003
6a974378fb Merge pull request #14281 from Seris02/fishingunnerf 
un-nerfs fishing from previous change
 2023-01-03 16:28:43 +10:00
Seris02
3dac95c5f5 typo in comment 2023-01-03 11:41:22 +08:00
Seris02
baa27a6230 universal formula change 2023-01-03 11:40:03 +08:00
Atermonera
852fc9f7dd Merge pull request #8867 from Seris02/augmentfix 
fixes augment implants so you can't spam the fuck out of them
 2023-01-02 19:07:53 -05:00
Mechoid
25e9fe26b6 Maintenance on Hydro code, specifically vines and bees. 2023-01-02 18:48:21 -05:00
faaaay
d11a5fb680 code 2023-01-02 14:19:04 +00:00
Pandora
1445c32f26 Update sprite_accessories_tail_vr.dm 2023-01-02 01:33:21 +00:00
Detective-Google
e9d3d3e5fa formatting 
was missing a space
 2023-01-01 08:28:05 -06:00
Detective-Google
5858507b44 adds halos 2023-01-01 08:24:37 -06:00
Heroman3003
674e59b94f Merge pull request #14280 from Heroman3003/sidona-robe-fix 
Fixes sidona's robes not being selectable properly
 2023-01-01 05:07:53 +10:00
Seris02
9ab98db41d un-nerfs fishing 2022-12-31 18:07:54 +08:00
Heroman
4ddefb6fdf Fixes sidona's robes not being selectable properly 2022-12-31 15:56:59 +10:00
Casey
5f0fb16e59 Merge pull request #14279 from Very-Soft/seasontime 
More RP seasons edits
 2022-12-31 00:08:47 -05:00
VerySoft
493c8edb79 Round 2 2022-12-30 23:45:11 -05:00
Heroman
21fa63b533 Fixes two admin bugs 2022-12-31 14:18:17 +10:00
VerySoft
8529b42dfc Brings Seasons to RP! 2022-12-30 22:23:17 -05:00
Heroman
768d5d253e Quick fix to borg mini-refactor 2022-12-31 07:14:38 +10:00
Casey
6eacab6772 Merge pull request #13926 from Very-Soft/attheend 
Time for Seasons
 2022-12-30 16:08:58 -05:00
Heroman3003
ead06fc630 Merge pull request #14271 from Novacat/nova-basicfixes 
Miscallaneous Tweaks
 2022-12-31 07:05:27 +10:00
Heroman3003
a533de71c6 Merge pull request #14269 from Heroman3003/borg-event-stuff 
Adjusts events and refactors borgs a bit in process
 2022-12-31 07:04:47 +10:00
Heroman3003
7bcdafa4f2 Merge pull request #14264 from Heroman3003/chaircolors 
Fixes comfy chair colors
 2022-12-31 07:04:41 +10:00
VerySoft
cdca99b54e last one? 2022-12-30 15:58:48 -05:00
Unknown
a2b74cf590 Miscellaneous tweaks 
- Swaps advanced health analyzers for phasic ones in some event zones (mostly ERT/CC)
- Removes the listening_level var from preset relays
 2022-12-30 15:29:28 -05:00
VerySoft
43add3bdb3 wow! I think it's done 2022-12-30 14:40:34 -05:00
VerySoft
f409384581 wawo 2022-12-30 13:45:39 -05:00
VerySoft
864ef313f3 A liddol update 2022-12-30 10:58:41 -05:00
Heroman
cd0fe57693 Makes Virgo 4 extreme weathers dissipate 2022-12-30 16:43:31 +10:00
Heroman
12918c673b Allows engineering dogborgs to rename doors/windoors 2022-12-30 14:50:27 +10:00
Heroman
f8b38d8c90 Refactors borgs and adjusts events 2022-12-30 14:36:27 +10:00
Heroman
8b9abe582c Fixes comfy chair colors 2022-12-29 16:43:48 +10:00
Heroman
f739b63e8d Allows SD-exclusive job titles to be used anywhere 2022-12-29 15:17:24 +10:00
VerySoft
3d68829188 ONE MORE AAAAAAAAA 2022-12-28 19:27:37 -05:00