Commit Graph
68716 Commits
Author SHA1 Message Date
Kashargul ead0180057 converts area vars to flags 2024-12-04 22:21:38 +01:00
CaseyandGitHub 847fa11fd6 Merge pull request #16664 from VOREStation/Map-Swap
Map Swap
2024-12-01 17:21:52 -05:00
CaseyandGitHub c02a954816 Map Swap 2024-12-01 17:16:07 -05:00
Heroman3003andGitHub f5f707030c Merge pull request #16506 from Darlantanis/RecordSaving
Ports in-round record updating
2024-11-30 14:42:17 +10:00
Heroman3003andGitHub a15578d8fd Merge pull request #16597 from Kashargul/miscGripper
up ports misc gripper, gargoyle, petrification, some message fixes
2024-11-30 14:41:36 +10:00
Heroman3003andGitHub 96cd99127a Merge pull request #16618 from ShadowLarkens/ui
Kitchen UI Update
2024-11-30 14:41:27 +10:00
Heroman3003andGitHub 6a78aaa65a Merge pull request #16653 from KillianKirilenko/kk-sdspawns
Space Ghost and SD Mining spawn tweaks
2024-11-30 14:41:11 +10:00
Heroman3003andGitHub 3237ba8169 Merge pull request #16654 from KillianKirilenko/kk-rocks
Samples from Strange Rocks
2024-11-30 14:40:50 +10:00
Heroman3003andGitHub 38e4aa874b Merge pull request #16648 from ShadowLarkens/paicard
Allow pAIs to attack_ai the machine they're inside,
2024-11-30 14:40:41 +10:00
Heroman3003andGitHub 90dc2821e9 Merge pull request #16649 from ShadowLarkens/microwave_improvemenets
Make the microwave preview what it'll (probably) create
2024-11-30 14:40:36 +10:00
Heroman3003andGitHub 031b6204e9 Merge pull request #16656 from SatinIsle/turkeygirl
Includes turkeygirl properly
2024-11-30 09:03:23 +10:00
SatinIsle 4bd3a5ea28 Includes turkeygirl properly
Fixes turkeygirl being unavailable.
2024-11-29 22:41:38 +00:00
Killian 117f0b8dc7 Merge branch 'kk-rocks' of https://github.com/KillianKirilenko/VOREStation into kk-rocks 2024-11-29 07:57:19 +00:00
KillianandKillian 633cc9514c samples from strange rocks 2024-11-29 06:46:30 +00:00
Killian 6a8f1bfc40 samples from strange rocks 2024-11-29 06:41:02 +00:00
Killian 5c81b06c74 space ghost and mining spawn tweaks 2024-11-28 23:33:43 +00:00
Heroman3003andGitHub 624ed2fb7a Merge pull request #16617 from KillianKirilenko/kk-misc3
Salvage Tech Title Fix
2024-11-28 15:12:08 +10:00
Killian 7a987e3a40 Update engineering.dm 2024-11-28 05:04:21 +00:00
Killian 298e8f3db3 Merge remote-tracking branch 'upstream/master' into kk-misc3 2024-11-28 05:03:15 +00:00
Heroman3003andGitHub 10de4fc09f Merge pull request #16511 from VOREStation/verb-subsystem
Verb manager subsystem & Speech controller
2024-11-28 14:43:53 +10:00
Heroman3003andGitHub 6074915f29 Merge pull request #16652 from SatinIsle/fix-edge
Fix Two active edges
2024-11-28 14:41:14 +10:00
Heroman3003andGitHub ed9824415a Merge pull request #16635 from Kashargul/voteTimer
fixes vote announce time
2024-11-28 14:40:35 +10:00
Heroman3003andGitHub 6496908c38 Merge pull request #16634 from Kashargul/dispensers
fix dispeners with many cartridges
2024-11-28 14:40:26 +10:00
Heroman3003andGitHub 8516e0f5db Merge pull request #16633 from Kashargul/agentCard
fix agent card for modify robot
2024-11-28 14:40:17 +10:00
Heroman3003andGitHub dde8601c84 Merge pull request #16629 from Kashargul/planet-time
Planet time debug uncapping and broken weapon chat output
2024-11-28 14:40:05 +10:00
Heroman3003andGitHub f552b4bdde Merge pull request #16624 from Kashargul/RS_Ports
Ports RS 658, 661 and some minor things
2024-11-28 14:39:22 +10:00
Heroman3003andGitHub 121532e26c Merge pull request #16622 from Darlantanis/MapUpgrades
Ports map upgradable machinery framework, map upgradable SMES's
2024-11-28 14:38:51 +10:00
Heroman3003andGitHub 21ed8391b6 Merge pull request #16620 from VOREStation/dependabot/npm_and_yarn/tgui/cross-spawn-7.0.6
Bump cross-spawn from 7.0.3 to 7.0.6 in /tgui
2024-11-28 14:38:30 +10:00
Heroman3003andGitHub 8d675e86e7 Merge pull request #16616 from Kashargul/things
some accessories
2024-11-28 14:38:12 +10:00
Heroman3003andGitHub b33dd0fd67 Merge pull request #16595 from Kashargul/usr-to-user-up-to-player_effects
usr to user up to player effects
2024-11-28 14:37:44 +10:00
SatinIsle a112a2c21e Update ship_tanker_betrayed.dmm 2024-11-28 00:15:35 +00:00
SatinIsle e00a4c0aa5 Found another in the debris field 2024-11-28 00:06:08 +00:00
SatinIsle 88ec19886f Fix one active edge
Fixes an active edge in the plain POI "oldhotel"
2024-11-27 23:58:39 +00:00
KashargulandGitHub d560b0f567 Merge branch 'master' into agentCard 2024-11-28 00:17:28 +01:00
KashargulandGitHub 8b8cef516b Merge branch 'master' into planet-time 2024-11-28 00:11:21 +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
Heroman3003andGitHub 05b28bac9e Merge pull request #16647 from Cameron653/Janihud-OP
Ports Janihud rework from Outpost 21.
2024-11-28 06:05:21 +10:00
Heroman3003andGitHub 6f020343bb Merge pull request #16650 from Heroman3003/thanksgivingturkey
Adds a turkey mob and reworks regular Turkey recipe
2024-11-28 05:53:12 +10:00
Cameron LennoxandGitHub da88e49778 Enables hud variant 2024-11-27 14:52:17 -05:00
Heroman 076d944576 Last minute typo fix 2024-11-28 05:39:13 +10:00
Heroman3003andGitHub 3a77e0b747 Merge pull request #16619 from SatinIsle/let-me-wear-wristbands
Allows wristbands and bracelets to attach to uniforms again
2024-11-28 05:35:27 +10:00
Heroman 0b10e7770b Adds a turkey mob and reworks regular Turkey recipe 2024-11-28 05:35:09 +10:00
Heroman3003andGitHub fa5a178010 Merge pull request #16515 from ShadowLarkens/zas
Some ZAS tweaks and minor optimizations
2024-11-28 05:34:47 +10:00
Heroman3003andGitHub 7e696cd850 Merge pull request #16586 from Kashargul/spritesheet
Spritesheet
2024-11-28 05:34:29 +10:00
Heroman3003andGitHub 8d70180e87 Merge pull request #16588 from ShadowLarkens/merk_skills
Completely merk all traces of the skill system
2024-11-28 05:34:18 +10:00
Heroman3003andGitHub 9bc748eb8e Merge pull request #16611 from TankTheBirb/fix-blindfold
Hides your eyes when wearing blindfolds
2024-11-28 05:33:30 +10:00
Heroman3003andGitHub 6e811b3c86 Merge pull request #16621 from Darlantanis/HandImplantFix
Hand implants can go in hands
2024-11-28 05:33:17 +10:00
Heroman3003andGitHub 5cd0d2afd1 Merge pull request #16646 from ShadowLarkens/microwave
Add emotes to ding and make microwave noises.
2024-11-28 05:30:47 +10:00
Heroman3003andGitHub 26e1333b3a Merge pull request #16644 from KillianKirilenko/kk-headsets
Headset Option Fixes
2024-11-28 05:30:32 +10:00
Heroman3003andGitHub 7f5fe8ab91 Merge pull request #16642 from KillianKirilenko/kk-vrjobs
Jobs _vr files crunch
2024-11-28 05:30:08 +10:00