Commit Graph

10456 Commits

Author SHA1 Message Date
Kashargul
e9550345d2 half of the food and drinks 2024-12-08 01:14:10 +01:00
Kashargul
1d8d5b34b5 medicine.dm 2024-12-07 02:10:10 +01:00
Kashargul
a12a4d2d5e toxins.dm 2024-12-07 01:03:25 +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
c64a251504 mecdicine_vr 2024-12-06 22:47:10 +01:00
Kashargul
5398ec84bf few more 2024-12-06 22:26:07 +01:00
Kashargul
939fcbb488 Merge branch 'master' into reagentToDefines 2024-12-06 21:57:14 +01:00
Kashargul
429398bdd7 some moire 2024-12-06 21:54:05 +01:00
Heroman3003
5092af9321 Merge pull request #16672 from Kashargul/areaStuff
converts area booleans to flags
2024-12-07 05:20:02 +10:00
Heroman3003
9941ffa8dc Merge branch 'master' into areaStuff 2024-12-07 05:14:52 +10:00
Heroman3003
619364a073 Merge branch 'master' into headset 2024-12-07 05:13:21 +10:00
Heroman3003
a827a8b5b2 Merge pull request #16667 from Kashargul/appearance
rework appearance changer
2024-12-07 05:07:30 +10:00
Heroman3003
146c3f4140 Merge pull request #16659 from TheCaramelion/Viro-Update-1
Virology Update 1
2024-12-07 05:06:20 +10:00
Heroman3003
edd99b63cf Merge pull request #16639 from KillianKirilenko/kk-charpod
"Maint Lurker" Hole
2024-12-07 05:05:22 +10:00
Heroman3003
6253051c21 Merge pull request #16598 from Kashargul/protRig
Prot rig up port
2024-12-07 05:04:29 +10:00
Kashargul
80edcd2c3d Converts gas, mat and reagent strings to defines 2024-12-06 17:26:00 +01:00
ShadowLarkens
9a940834b4 Enable creation of cycling airlocks 2024-12-04 13:45:19 -08:00
Kashargul
ead0180057 converts area vars to flags 2024-12-04 22:21:38 +01:00
Killian
6306e5b6ca Update event_vr.dm 2024-12-04 12:53:11 +00:00
Killian
01813cd4d0 maint lurker setup 2024-12-04 12:22:40 +00:00
Killian
2e91c505c3 Update event_vr.dm 2024-12-04 09:28:49 +00:00
Killian
36ddfae1ab Merge branch 'kk-charpod' of https://github.com/KillianKirilenko/VOREStation into kk-charpod 2024-12-04 09:27:16 +00:00
Killian
e937788c58 Update event_vr.dm
fix up spans for the other pods, some other minor adjustments
2024-12-04 09:27:02 +00:00
Killian
001afdfbc5 Merge branch 'master' into kk-charpod 2024-12-04 09:25:02 +00:00
Kashargul
9cb06747fb some robot interacts for closeby things 2024-12-04 01:49:13 +01:00
Kashargul
798589a4de . 2024-12-03 11:21:55 +01:00
Kashargul
5febd2f97f fix multiple headsets 2024-12-03 11:17:44 +01:00
Kashargul
90c2d09e8e also fix that 2024-12-02 23:22:21 +01:00
Kashargul
56c53e72fe Merge branch 'master' into protRig 2024-11-30 15:00:57 +01:00
Heroman3003
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
Heroman3003
96cd99127a Merge pull request #16618 from ShadowLarkens/ui
Kitchen UI Update
2024-11-30 14:41:27 +10:00
Heroman3003
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
Guti
823db69af5 Merge branch 'master' into Viro-Update-1 2024-11-29 22:56:42 +01:00
Kashargul
07958d0657 Merge branch 'master' into protRig 2024-11-28 15:57:44 +01:00
Heroman3003
8d675e86e7 Merge pull request #16616 from Kashargul/things
some accessories
2024-11-28 14:38:12 +10:00
Kashargul
2fdde73d3a Merge branch 'master' into protRig 2024-11-27 23:58:52 +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
Killian
c00e6f3d4d Merge remote-tracking branch 'upstream/master' into kk-charpod 2024-11-27 20:37:02 +00:00
Heroman3003
05b28bac9e Merge pull request #16647 from Cameron653/Janihud-OP
Ports Janihud rework from Outpost 21.
2024-11-28 06:05:21 +10:00
Heroman3003
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 Lennox
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
Heroman
0b10e7770b Adds a turkey mob and reworks regular Turkey recipe 2024-11-28 05:35:09 +10:00
Heroman3003
fa5a178010 Merge pull request #16515 from ShadowLarkens/zas
Some ZAS tweaks and minor optimizations
2024-11-28 05:34:47 +10:00
Heroman3003
8f061174aa Merge pull request #16630 from Kashargul/clamps
surgery firstaid bags can carry bone clamps
2024-11-28 05:28:53 +10:00
Heroman3003
b6486dc686 Merge pull request #16626 from SatinIsle/bed-flip
Flippable beds and sheets
2024-11-28 05:28:33 +10:00
Killian
e016744474 straggler pod: job/role finish 2024-11-27 12:12:03 +00:00
Killian
69a1609848 straggler pod: job/role WIP 2024-11-27 10:37:57 +00:00
ShadowLarkens
49d0d773e5 Make the microwave preview what it'll (probably) create 2024-11-26 11:12:56 -08:00