cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 18:31:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,442 Commits 8 Branches 26 Tags
fbf6bf41c244a89a04221406531cbdf2bf679ea2
Commit Graph

6143 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
32e97ebda2 Update mre.dm 2023-03-14 17:59:20 +10:00
Atermonera
9987e78f5a Fixes a raunchy typo 2023-03-14 03:47:24 -04: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
7a5c03bb65 Update toolbox.dm 2023-03-13 15:04:26 +10:00
Heroman3003
cd72de592a Update syndicate_ids.dm 2023-03-13 15:03:55 +10:00
Heroman3003
78ef017052 Update chewables.dm 2023-03-13 15:03:13 +10:00
Heroman3003
446cd0e362 Update AI_modules.dm 2023-03-13 15:02:48 +10:00
Heroman3003
d2bc2ce1b0 Update AI_modules.dm 2023-03-13 15:02:29 +10:00
Heroman3003
aec41a05f5 Update trash.dm 2023-03-13 15:01:24 +10:00
Heroman3003
a236ff66ea Update flash.dm 2023-03-13 14:59:53 +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
Heroman3003
d477c0a044 Merge pull request #14583 from Seris02/adminjumplink 
more fixed admin hrefs
 2023-03-09 15:07:59 +10:00
Seris02
aadd99ba94 more fixed admin hrefs 2023-03-01 11:27:34 +08:00
Heroman3003
922b787c46 Merge pull request #14568 from Seris02/janidrakeplush 
adds more drake plushies, and changes scidrake lights to match sci colors
 2023-02-26 19:45:15 +10:00
Seris02
7fcb9347f9 alt click description and license update 2023-02-26 16:57:14 +08:00
Seris02
cdaaba7386 adds more drake plushies, and changes scidrake lights to match sci colors 2023-02-26 16:33:37 +08:00
Heroman3003
7c690177ac Merge pull request #14533 from VOREStation/upstream-merge-8965 
[MIRROR] Suit kits no longer set item_state on hooded clothes
 2023-02-26 10:58:30 +10:00
Heroman3003
c26c22c9d2 Update flash.dm 2023-02-25 18:17:08 +10:00
Killian
69491d46f2 Merge remote-tracking branch 'upstream/master' into kk-lore 2023-02-25 07:47:02 +00:00
Killian
f49ff8a23e seperate birthplace option 2023-02-25 07:46:47 +00:00
Cerebulon
19715ab471 /tg/ era language pass 2023-02-25 02:34:24 -05:00
Heroman3003
d52f309d59 Merge pull request #14546 from KillianKirilenko/kk-misc 
Custom Species name in Records
 2023-02-25 13:02:38 +10:00
Killian
d9a91ef898 more species data availability 
I have altered the datacores. pray I do not alter them further.
 2023-02-24 06:28:08 +00:00
Heroman
a0f50e4c81 Adjusts artistic crate orders 2023-02-22 20:17:46 +10:00
Heroman3003
6b0239fa70 Merge pull request #14497 from Seris02/capcrystalunleashfix 
cap crystal ooc escape fix
 2023-02-22 18:50:13 +10:00
Atermonera
7aed9af957 Merge pull request #8965 from Atermonera/fix_hooded_suit_kit 
Suit kits no longer set item_state on hooded clothes
 2023-02-22 00:21:11 -05:00
Seris02
08f0aafac4 turf 2023-02-21 15:36:30 +08:00
Seris02
6be3a9e5ff cap crystal ooc escape fix 2023-02-16 13:30:48 +08:00
Runa Dacino
fff4e9ffc5 Implements new machine that creates autoinjectors en masse 2023-02-12 21:03:07 +01:00
Spookerton
7da09c462f Merge pull request #8929 from Cerebulon/powersink-sprite 
Fixes powersink having no sprite
 2023-02-05 10:08:51 -05:00
Heroman3003
18e989b84c Merge pull request #14428 from VOREStation/upstream-merge-8915 
[MIRROR] allows soap and showers to clean toes, and space cleaner to actually clean synthetic toes
 2023-02-05 06:57:51 +10:00
Spookerton
c5e353fab7 Merge pull request #8915 from Seris02/letmeCLEAN 
allows soap and showers to clean toes, and space cleaner to actually clean synthetic toes
 2023-02-04 15:31:56 -05:00
TheGreatKitsune
f726f7553b Add required components to circuit board examine text 2023-02-04 11:28:37 -06:00
Runa Dacino
9d45e8bc49 Fixes adv nif-repair tool eating nanopaste when full 2023-02-03 15:19:15 +01:00
Runa Dacino
b07c9e3227 Time travel fix! 2023-01-24 14:45:08 +01:00
Killian
a403fa06f9 [TILT WARNING] 
Now a toggle
 2023-01-20 13:18:33 +00:00
Heroman3003
fd94efe521 Merge pull request #14336 from VOREStation/upstream-merge-8870 
[MIRROR] Repairing light robotic damage messaging fix
 2023-01-19 13:20:04 +10:00
Heroman3003
ec2ea599ed Update weldingtool.dm 2023-01-19 12:33:24 +10:00
Heroman3003
a745af0363 Merge pull request #14330 from Novacat/nova-basicfixes 
Uplink and Pouch Tweaks
 2023-01-16 18:44:18 +10:00
Atermonera
1966acb410 Repairing light robotic damage messaging fix 2023-01-15 14:04:19 -05:00
Unknown
be255c4b4f Uplink and Pouch Tweaks 
- Adds capture crystals to uplink
- Swaps bluespace pouch for normal pouches in uplink
- Small pouches are slightly less cumbersome, large pouches slightly more cumbersome
- Reduced storage of bluespace pouches to be consistent with bags of holding
 2023-01-14 22:42:16 -05:00
Heroman
d2e2bf9d66 Makes all carpet types orderable and gives them tile icons 2023-01-13 17:15:44 +10:00
Heroman3003
ead06fc630 Merge pull request #14271 from Novacat/nova-basicfixes 
Miscallaneous Tweaks
 2022-12-31 07:05:27 +10: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
Heroman
f8b38d8c90 Refactors borgs and adjusts events 2022-12-30 14:36:27 +10:00
Heroman
547382e647 Fixes autolathe and smartfridge issues 2022-12-28 17:43:04 +10:00
Heroman
042ef04bdf Various minor fixes 2022-12-27 16:17:24 +10:00
Casey
7dec3dbaeb Merge pull request #14234 from Novacat/nova-basicfixes 
Fixes some Oversights
 2022-12-24 03:36:01 -05:00